Merge "Fix typo in haproxy docker mapping"