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

with subprocess.Popen(...) as ps: