Match MockConfigAdaptor to ConfigAdaptorImpl.

@bug W-2104653@

@rev tbliss@
Merging origin/goliver/master-pending-mock-constructor into master