Fix cinder driver names

Fix names of Block Storage drivers.

Change-Id: If09bb6573e93aaf1281612c49563c051b5bac527
Closes-Bug: #1369055
Closes-Bug: #1368366
(cherry picked from commit 961bccdf041b913805bb2aed51263be2f291d79d)