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

We should remove it there, and just define it here. libmapi/libmapi.h is a public header; it shouldn't muck about with the environment of whatever 3rd party application builds against OpenChange.