Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Update local.bro for Bro 2.2

Adding to BIT-1095.
Updating submodule(s).

 [nomail]
Improve a unit test involving 'when' conditionals.

May fix a sporadic failure, in which case it was just not getting enough
time to run or lookup_hostname() taking longer than ~3 seconds.  Else,
the new output should give more hints on what's going wrong.  In any
case, termination conditions for the test are now explicit.