* commit '35c395ab':
  Merge pull request #652 in ZP/z-push from bugfix/ZP-1345-own-private-items-stripped-when-folder-is-in-additionalfolders to develop
  Merge pull request #640 in ZP/z-push from bugfix/ZP-1345-own-private-items-stripped-when-folder-is-in-additionalfolders to develop
  Merge pull request #639 in ZP/z-push from bugfix/ZP-1344-reply-back-exporter-doesn-t-honour-private-flag to develop