Merge pull request #13548 from gladiac1337/haproxy-2.2.4