Updated template files to match v4 Broker config
Merge pull request #236 from nhr/v4_template_fixes

Updated template files to match v4 Broker config