haproxy-devel: patches from upstream

 - patch 18,19.20