Merge changes from topic "cpuEnergyAttribution" into sc-dev

* changes:
  Accumulate charge instead of energy in BatteryStatsImpl
  Accumulate and attribute measured Cpu energy in BatteryStats