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

with open(settings_path. 'r') as f: