Merge proposals dependent on lp://qastaging/~cisco-openstack/puppet-openstack-cisco/cis-havana-puppet-heat

1. cis-havana-puppet-heat
2. Dependent merge proposals