Apply Suricata 1.4.1 changes: build fix and add query normalization call
Apply Suricata 1.4.2 changes

https://github.com/inliniac/suricata/commit/c7c5fa5dcaddf49cac4caaeac099faadea0d7574

Backport by Anoop Saldanha:

Backport 8bbcdb6 changes from libhtp 0.5.x
to Suricata's bundled libhtp.

We now handle ipv6 addresses in uri and host header.