Merge branch 'bugfix/ZP-895-integer-ids-can-trigger-name-switches' of https://stash.z-hub.io/scm/zp/z-push into feature/ZP-556-having-access-to-the-public-folder

Conflicts:
	src/backend/zarafa/zarafa.php