Merge "Remove CONF values from volume clients"