Merge "Remove services/volume/{v1,v2} directories"