Bug #729028 - Adapt to OpenChange 2.1 API changes