Merge "Add skip check to 'test_update_volume_attachment'"