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

Please catch less generic exceptions. What is the kind of exception type that can happen here?