Fix haproxy fake hosts issue, first part of #617