Merge pull request #22884 from gladiac/haproxy-2.8.5