=rem #15109: Separate field in Pass for refuseUid

  - Fixes #15109
  - also fix GotUid race with InvalidAddress supervision event
(cherry picked from commit 3fe83fa)
Merge pull request #15208 from drewhk/wip-15109-refuseuid-clash-fwdport-drewhk

=rem #15109: Separate field in Pass for refuseUid (forward)
=act #15217 the watching message is generated always,
so the test should await on both, before it expects the
unsubscribing message, otherwise it's racy.

Resolves #15217
Merge pull request #15219 from ktoso/fix-15217-more-exact-eventstream-test

=act #15217 await for both "watching" messages in eventstreamspec