Bug#1030519: hw-detect: firmware file path handling is fragile

[James Addison]

Followup-For: Bug #1030519
Control: unmerge -1
Control: reassign -1 hw-detect
Control: retitle -1 hw-detect: firmware file path handling is fragile