Merge "Remove CONF reference from volume client"