minimize cinder configuration changes

cinder actually only needs a few very specific changes to move from
folsom to grizzly. Make upgrade-cinder only do these to help with
documenting minimum changes to move forward.

Change-Id: I411a1af3d9eeeaca4a0e4129c9727d2f7bd7651d
Merge "minimize cinder configuration changes"