Merge pull request #10157 from gladiac1337/haproxy-2.0.7