Wire up the UDC integration test module correctly.
Merge pull request #2412 from benbc/2.0-udc-integration-test-fixes

2.0 udc integration test fixes