haproxy-devel:
 - merge conflict between 17 and 18