Merge "add client_manager_class param to BaseTestCase"