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

I take care of this