Fixes for deprovision

This need openchange pull request https://github.com/Zentyal/openchange/pull/77 in order to work
wrong solved conflict