Bonjour: Fix NextCacheCheck bug.
Try to fix occassional leak of subscriptions on shutdown.  See #2934.
Merge branch 'master' of ssh://core.linn.co.uk/home/git/ohnet