Fix versioning UDC integration test module.
Merge pull request #2413 from benbc/2.1-udc-integration-test-fixes

2.1 udc integration test fixes