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

@javierag: License mismatch: should be 3 or later - please update.