Merge remaining Zentyal changes to openchange master and gets everything sync'ed

This mapistore_check tool does not exist anywhere. Remove from the pull request