Merge "Upload os_client_config to mine during upgrade"