Merge "Enable tls-proxy in jobs where it was disabled"