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

@kernevil: typo bakup -> backup