Merge "Add skip for test_encrypted_cinder_volumes_cryptsetup"