Update cinder configs, nova-volume is being discontinued in Grizzly, therefore cinder should just be the default
Merge branch 'master' of github.com:loganmc10/puppetlabs-openstack