Merge pull request #6866 from gladiac1337/feature-haproxy-v1.8.13-updates