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

Update the formatting to match OpenChange coding policy