Update cinder.conf.erb to Grizzly
Merge pull request #37 from saschpe/release/pebbles/master

Update cinder.conf.erb to Grizzly