[BUGFIX release] Add missing HistoryLocation code that was lost in manual merge from es6 => stable

@rjackson As discussed on IRC, currently the `stable` branch is failing tests 2965, 2966 on an *actual* browser but not Travis. Most likely cause Travis doesn't support `history` so a different code path is being taken since `HistoryLocation` is still lacking full test coverage.