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

Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config

src/Umbraco.Core/PluginManager.cs

@@ -551,16 +551,7 @@ namespace Umbraco.Core
         {
             return ResolveTypesWithAttribute<BaseMapper, MapperForAttribute>();
         } 
-
-        /// <summary>
-        /// Returns all available IMigrations in application
-        /// </summary>
-        /// <returns></returns>
-        internal IEnumerable<Type> ResolveMigrationTypes()
-        {
-            return ResolveTypes<IMigration>();
-        }
-
+        
         /// <summary>
         /// Returns all SqlSyntaxProviders with the SqlSyntaxProviderAttribute
         /// </summary>