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

@javierag Same thing here - maybe use a config.php for all examples?