haproxy 1.4.25, devel 1.5-dev26

We could pull directly from git if that is what we want to do, thoughts? I've added a comment.