Merge branch v8/dev into v8/feature/5170-IPublishedContent

src/Umbraco.Web/Models/ContentEditing/ContentVariantSave.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Validation;
@@ -16,6 +17,7 @@ namespace Umbraco.Web.Models.ContentEditing
 
         [DataMember(Name = "name", IsRequired = true)]
         [RequiredForPersistence(AllowEmptyStrings = false, ErrorMessage = "Required")]
+        [MaxLength(255, ErrorMessage ="Name must be less than 255 characters")]
         public string Name { get; set; }
 
         [DataMember(Name = "properties")]

src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs

@@ -250,6 +250,7 @@ namespace Umbraco.Web.Models.Mapping
             var result = Roles.GetAllRoles().Distinct()
                 // if a role starts with __umbracoRole we won't show it as it's an internal role used for public access
                 .Where(x => x.StartsWith(Constants.Conventions.Member.InternalRolePrefix) == false)
+                .OrderBy(x => x, StringComparer.OrdinalIgnoreCase)
                 .ToDictionary(x => x, x => false);
 
             // if user has no roles, just return the dictionary