Merge "Patch to skip test_volume_swap on yoga-core-ceph-local-non-dvr-crypt-volume-barbican environment." into mcp/caracal