Changes needed for merge with openchange/openchange