Merge changes from topic 'battery_smear_move' into oc-dev

* changes:
  Batterystats logs smeared power model values
  Copy smearing method to BatteryStatsHelper