tweak the templates so the defaults are actually what we want.
tweak the templates so the defaults are actually what we want.

Signed-off-by: Angus Salkeld <86b65304d27d8de73dd7d624c33df7e088f8d94b@redhat.com>

srznew/heat,ntt-sic/heat,rh-s/heat,openstack/heat,NeCTAR-RC/heat,steveb/heat,jasondunsmore/heat,dims/heat,takeshineshiro/heat,miguelgrinberg/heat,dragorosson/heat,rickerc/heat_audit,cryptickp/heat,jasondunsmore/heat,pratikmallya/heat,rh-s/heat,varunarya10/heat,JioCloud/heat,openstack/heat,Triv90/Heat,Triv90/Heat,steveb/heat-cfntools,bbandaru/heat-cfntools,varunarya10/heat,citrix-openstack-build/heat,pshchelo/heat,maestro-hybrid-cloud/heat,redhat-openstack/heat,redhat-openstack/heat,cwolferh/heat-scratch,miguelgrinberg/heat,noironetworks/heat,cryptickp/heat,citrix-openstack-build/heat,cwolferh/heat-scratch,maestro-hybrid-cloud/heat,steveb/heat,Triv90/Heat,gonzolino/heat,sdake/heat-jeos,ntt-sic/heat,srznew/heat,JioCloud/heat,rdo-management/heat,pshchelo/heat,steveb/heat-cfntools,gonzolino/heat,rickerc/heat_audit,pratikmallya/heat,openstack/heat-cfntools,noironetworks/heat,NeCTAR-RC/heat,rdo-management/heat,dims/heat,takeshineshiro/heat,dragorosson/heat