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

Please add a docstring