Merge changes If35518c0,I04bede0b

* changes:
  bootstat: add support for suppressing needle match on output
  bootstat: usb and rtc refinement