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

@kernevil: Same Zentyal specific comment than earlier