Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6

# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	src/Umbraco.Tests/Umbraco.Tests.csproj

src/Umbraco.Web/Models/ContentExtensions.cs

@@ -46,9 +46,7 @@ namespace Umbraco.Web.Models
         {
             var route = umbracoContext == null
                 ? null // for tests only
-                : umbracoContext.ContentCache.GetRouteById(contentId); // cached
-
-            if (route != null && route.StartsWith("err/")) route = null;
+                : umbracoContext.ContentCache.GetRouteById(contentId); // may be cached
 
             var domainHelper = new DomainHelper(domainService);
             IDomain domain;
@@ -73,7 +71,7 @@ namespace Umbraco.Web.Models
             }
             else
             {
-                // if content is published then we have a (cached) route
+                // if content is published then we have a route
                 // from which we can figure out the domain
 
                 var pos = route.IndexOf('/');