Merge branch '2.11' into 2.12

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java

@@ -177,9 +177,10 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
         JsonToken curr = p.currentToken();
 
         // Usually should just get string value:
-        if (curr == JsonToken.VALUE_STRING || curr == JsonToken.FIELD_NAME) {
+        // 04-Sep-2020, tatu: for 2.11.3 / 2.12.0, removed "FIELD_NAME" as allowed;
+        //   did not work and gave odd error message.
+        if (curr == JsonToken.VALUE_STRING) {
             text = p.getText();
-
         // But let's consider int acceptable as well (if within ordinal range)
         } else if (curr == JsonToken.VALUE_NUMBER_INT) {
             // ... unless told not to do that