Merge change 24918 into eclair

* changes:
  Put back support for hardware.ini at the top level of an add-on.