Updated template files to match v4 Broker config
Merge pull request #237 from nhr/template_fixes

Updated template files to match v4 Broker config