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

Avoid "except:"; catch specific exceptions instead, unless you re-raise the exception.

http://legacy.python.org/dev/peps/pep-0008/#programming-recommendations