accept '/usr' in firmware paths (closes: #1116709)

This is intended to d the same as the patch from #1116709.

It also gets rid of the duplication involved in the grep | sed | grep pipeline by reducing it to a singe sed

edited: I've just added a second commit that removes a few more redundant greps -- no need to include that, but I though I'd try tidying up while I was about it