Fix using cinder volumes with nodemanager in HDP2

Change-Id: Ic19b10ce9e9914bc530250c115507ec0f011e912
Closes-bug: #1357082
Merge "Fix using cinder volumes with nodemanager in HDP2"