REL-2139: GMOS template updates
Merge pull request #134 from swalker2m/bugfix/REL-2139

REL-2139: GMOS template updates