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

Perhaps catch StopIteration just for the line "env_name = server_env_names.next()".