Fix cinder driver names

Fix names of Block Storage drivers.

Change-Id: If09bb6573e93aaf1281612c49563c051b5bac527
Closes-Bug: #1369055
Closes-Bug: #1368366
Merge "Fix cinder driver names"