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

@javierag This example is too specific to your environment, make it stub/generic or remove it