fix broken locale menu display

lib-util/src/main/java/password/pwm/util/java/CollectorUtil.java

@@ -74,7 +74,12 @@ public class CollectorUtil
         return Collectors.collectingAndThen( Collectors.toUnmodifiableMap(
                         keyMapper,
                         valueMapper ),
-                s -> new TreeMap<>( comparator ) );
+                s -> {
+                    final SortedMap<K, U> sortedMap = new TreeMap<>( comparator );
+                    sortedMap.putAll( s );
+                    return sortedMap;
+                } );
+
     }
 
     public static <T, K extends Enum<K>, U> Collector<T, ?, Map<K, U>> toUnmodifiableEnumMap(

lib-util/src/test/java/password/pwm/util/java/CollectorUtilTest.java

@@ -28,6 +28,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.SortedMap;
 import java.util.function.Function;
 
 public class CollectorUtilTest
@@ -104,4 +105,23 @@ public class CollectorUtilTest
         Assertions.assertEquals( TestEnum.ONE, testSet.iterator().next() );
         Assertions.assertThrows( UnsupportedOperationException.class, () -> testSet.remove( TestEnum.ONE ) );
     }
+
+    @Test
+    public void collectorToSortedMap()
+    {
+        final Map<String, String> input = Map.ofEntries(
+                Map.entry( "2", "two" ),
+                Map.entry( "1", "one" ),
+                Map.entry( "3", "three" ) );
+
+        final SortedMap<String, String> sortedMap = input.entrySet().stream()
+                .collect( CollectorUtil.toSortedMap(
+                        Map.Entry::getKey,
+                        Map.Entry::getValue,
+                        String.CASE_INSENSITIVE_ORDER
+                ) );
+
+        Assertions.assertEquals( 3, sortedMap.size() );
+        Assertions.assertEquals( "1", sortedMap.firstKey() );
+    }
 }