HAProxy fixes.

[merge]