Merge pull request #406 in ZP/z-push from feature/ZP-1072-open-shared-folders-api-add-folders to develop

* commit 'bc86a936':
  ZP-1072 Save different parentids in ASDevice->AddAdditionalFolder(), consider parentid when checking for duplicate names (may not occur in the same folder), order folders correctly, transport parentids when building SyncObjects for FolderSync.