Fix using cinder volumes with nodemanager in HDP2

Change-Id: Ic19b10ce9e9914bc530250c115507ec0f011e912
Closes-bug: #1357082
(cherry picked from commit bd483955ff6e59c9671cd353dcfd5b51da038ebc)
Merge "Fix using cinder volumes with nodemanager in HDP2" into stable/icehouse