Revert "Revert "Merge pull request #16127 from changm/bug968478""

This reverts commit 9786c35567a238a30560b387061765dab998232e.
Bug 932605 - [calendar] caldav server for integration testing