Merge changes I7771a43b,If613c5cf into sc-dev

* changes:
  Inserts last 24 hour agrregate data into indexed usage map
  Add a method to calculate battery usage diff results from history