Fix bad backport for FormatDateTimeFormatter changes

Author: rjernst

server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java

@@ -935,8 +935,8 @@ String resolveExpression(String expression, final Context context) {
                                     }
                                     dateFormatter = DateTimeFormat.forPattern(dateFormatterPattern);
                                 }
-                                DateTimeFormatter parser = dateFormatter.withZone(timeZone);
-                                FormatDateTimeFormatter formatter = new FormatDateTimeFormatter(dateFormatterPattern, parser, Locale.ROOT);
+                                DateTimeFormatter parser = dateFormatter.withLocale(Locale.ROOT).withZone(timeZone);
+                                FormatDateTimeFormatter formatter = new FormatDateTimeFormatter(dateFormatterPattern, parser, parser);
                                 DateMathParser dateMathParser = formatter.toDateMathParser();
                                 long millis = dateMathParser.parse(mathExpression, context::getStartTime, false,
                                     DateUtils.dateTimeZoneToZoneId(timeZone));

server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java

@@ -268,7 +268,7 @@ public void checkCompatibility(MappedFieldType fieldType, List<String> conflicts
                         + "] to incompatible type [" + other.rangeType.name + "].");
                 }
                 if (this.rangeType == RangeType.DATE) {
-                    if (Objects.equals(dateTimeFormatter().format(), other.dateTimeFormatter().format()) == false) {
+                    if (Objects.equals(dateTimeFormatter().pattern(), other.dateTimeFormatter().pattern()) == false) {
                         conflicts.add("mapper [" + name()
                             + "] is used by multiple types. Set update_all_types to true to update [format] across all types.");
                     }