Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into bugfix/ZP-897-rename-zcp-backend

Conflicts:
	src/backend/kopano/config.php
	src/backend/kopano/kopano.php
	src/config.php