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

@javierag please wipe commented code?