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

Please use a single-line description as the first line in docstrings. 

See http://legacy.python.org/dev/peps/pep-0008/#id24