Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs

.gitignore

@@ -91,3 +91,6 @@ src/Umbraco.Web.UI/App_Plugins/*
 src/*.psess
 src/*.vspx
 src/Umbraco.Web.UI/umbraco/js/routes.js.*
+NDependOut/*
+*.ndproj
+QueryResult.htm