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

You can also compiled them with `make unittest` in root folder