Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-files-after-umbraco-context-abstractions

# Conflicts:
#	src/Umbraco.Abstractions/PublishedContentExtensions.cs
#	src/Umbraco.Abstractions/Routing/AliasUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/DefaultMediaUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/UrlProvider.cs
#	src/Umbraco.Abstractions/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
#	src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
#	src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
#	src/Umbraco.Tests/TestHelpers/TestHelper.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
#	src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
#	src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoContextFactory.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs

src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs

@@ -143,7 +143,8 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
                 webSecurity.Object,
                 globalSettings,
                 new TestVariationContextAccessor(),
-                TestHelper.IOHelper);
+                TestHelper.IOHelper,
+                TestHelper.UriUtility);
 
             //replace it
             umbracoContextAccessor.UmbracoContext = umbCtx;