Merge "Increasing capacity of cinder-volume loop device"