Auto merge of #2492 - Turbo87:location-type, r=locks

ember-router-scroll: Fix deprecation warning

Overriding the default `locationType` is deprecated now

r? @locks

Author: bors

config/environment.js

@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'cargo',
     environment,
     rootURL: '/',
-    locationType: 'router-scroll',
+    locationType: 'auto',
     historySupportMiddleware: true,
     EmberENV: {
       FEATURES: {