Merge pull request #652 in ZP/z-push from bugfix/ZP-1345-own-private-items-stripped-when-folder-is-in-additionalfolders to develop

* commit '503f4423':
  ZP-1345 Use Utils::GetFolderOriginFromId().