Merge "Enable tls-proxy support for test jobs"