Merge "Handle upgrading cinder-volume under pacemaker" into stable/ocata