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

@blaxter please update to match openchange coding policy (alignment of variables)