- merged r35009 r35029] from Zarafa trunk

git-svn-id: https://z-push.org/svn/z-push/trunk@1316 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5