Merge "Add config options to set proxy_url"