SyntaxConformanceTest - Fix failure for MessageTemplates
Merge pull request #1627 from totten/master-msg-tmpl-api

SyntaxConformanceTest - Fix failure for MessageTemplates