am 8c7605b1: Merge "Fix issue #17397177: BatteryStats reporting error on job start/stop" into lmp-dev

* commit '8c7605b11939713e7540813933d91f006027426d':
  Fix issue #17397177: BatteryStats reporting error on job start/stop