Merge "Modify haproxy config and collect logs"