haproxy: fixes from upstream