Merge "Add _set_object_storage_clients() to client setting"