Fix problems with component def results.

@bug W-2027096@

@rev eric.anderson@

@P4CL: 8575259@
Merging origin/goliver/master-pending-wire-defs into master