Merge "[PROD-30068] Fix invalid Haproxy configuration"