Merge "Extend get_client_manager to support roles"