Merge "Adding GS_PROXY prefix to GS_URL in proxy scenario"