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

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