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

@blaxter @kamenim: OK to merge cmake based unit test into master but they need to be replaced with autoconf version asap