Realign 1.4 patches to haproxy 1.4.23