Fix Cinder volumes support with xenserver

Fixes bug: #1193422

Change-Id: I8cd36112a647c4207dec8290511b01f1c22c0879
Merge "Fix Cinder volumes support with xenserver"