Merge changes I93b4210f,Ifdc1d4fd

* changes:
  bootstat: handle a bad bit error rate issue with pstore
  bootstat: better validation of battery level (shutdown,battery)