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

Please don't include debian packaging in the upstream branch.