Merge pull request #9296 from gladiac1337/haproxy-v2.0.0-fix