Realign 1.5 patches to haproxy 1.5-dev18