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

Conflicts:
	src/umbraco.providers/members/UmbracoMembershipProvider.cs

src/Umbraco.Core/Models/Membership/MemberCountType.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Services
+namespace Umbraco.Core.Models.Membership
 {
     /// <summary>
     /// The types of members to count

src/Umbraco.Core/Services/MemberService.cs

@@ -9,6 +9,7 @@ using Umbraco.Core.Auditing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Querying;

src/Umbraco.Core/Umbraco.Core.csproj

@@ -1033,7 +1033,7 @@
     <Compile Include="Services\LocalizationService.cs" />
     <Compile Include="Services\MacroService.cs" />
     <Compile Include="Services\MediaService.cs" />
-    <Compile Include="Services\MemberCountType.cs" />
+    <Compile Include="Models\Membership\MemberCountType.cs" />
     <Compile Include="Services\MemberGroupService.cs" />
     <Compile Include="Services\MemberService.cs" />
     <Compile Include="Services\MemberTypeService.cs" />