Re-add missing AuraHistoryService code from bad merge

@rev kgray@
Merging origin/tbliss/master-pending-readd-missing-historyService-code into master