Merge pull request #404 in ZP/z-push from bugfix/ZP-1087-short-folderid-hash-collisions-on to develop

* commit '844e925b':
  ZP-1087 Also check backend2folderidCache for generated but not (yet) synchronized short folderids when hashing.