Modifications to prepare for PatchSet 2 review
Merge branch 'master' of https://github.com/steve-gregory/heat-templates