Fix "Broken Cinder Volume"

Fixes: bug #1214878

Change-Id: I3d43a73eb7a3b2a80c5a137cf7410f29af384130
Merge "Fix "Broken Cinder Volume""