Merge "Include os_client_config.admin_identity to core"