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

Not sure what "binary" copy means here. :) Is there another kind of copy?