Merge "Enable tls-proxy support in test jobs"