Merge "Support renaming of ProxyProperties to ProxyInfo"