Merge "Remove CONF values from object_storage clients"