Merge "Cinder: Wait for volume to be 'available' before attaching"