Merge "Fix SDWAN restapi templates" into dublin