[r=jtv][bug=1235174][author=allenap] Repopulate tags when commissioning finishes.

Also removes some temporary shims used during testing, and replaces them with the new and tested inject_lshw_result().