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

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