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

It's defined in a lot of places, libmapi/libmapi.h for instance.