Backport from trunk r9918

Fix handling PUBLISH with Expires 0

SF bug ID: 3607182
Backport from trunk r9919

Only send PIDF manipulation when there are no other presence bodies