Sync cinder module from puppetlabs upstream

v4.0.0 6dbafb7a8f60358508c949f003e67cdf5a548ec8

Change-Id: Ibcb4f87afb4c4e8a7d196adb212fe66798457e5a
Implements: blueprint merge-openstack-puppet-modules
Merge "Sync cinder module from puppetlabs upstream"