bug 775 libhtp 0.5.x upgrade

WIP for review only