1) we weren't waking up a discoEndpoint that once existed and
went idle for 5 minutes and then got a disco message again.
2) userspaceEngine.noteReceiveActivity had a buggy check; fixed
and added a test
(cherry picked from commit 9a346fd8b45be232b2ac6a76f206200f7c4e2857)