Merge "Fix SDWAN restapi templates"