Merge "[SDNC] Make cmpv2Enabled control the creating of volumes and mounts"