Make sure the properties are defined in all cases.
Make sure the properties are defined in all cases.

fixes #194

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

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