backport from trunk (rev 9671):
- fixed who the NOTIFYs are built when triggered by a PUBLISH with expire 0; This is actually a revert of commit 9351, which seems to have some side-effects.
  Thanks to Damien Sandras for helping with the the debugging.
  Closes bug #3588141