Squashed 'libs/libhtp/' changes from 7bcc0f2..9e5fad1

9e5fad1 Tidy up test.
9140d07 Typo.
524389f Fixed gtest not compiling on OS X 10.9.
4f58e05 Fix HTP_HOST_AMBIGUOUS false positive, by not checking for differences when one of the port values is not available. It's not the real fix, but it will do for now, until we determine if these checks add any value at all.

git-subtree-dir: libs/libhtp
git-subtree-split: 9e5fad1d17c63b5a49628fb922f35b43f4d8dde2
libhtp: Sync with upstream 0.5.x branch.
waggle planner: Loop detecting for follows rules was wrong.
rule_engine: Add more logging and fix logic around rules  actions in response.

Conflicts:
	engine/rule_engine.c