Requested changes for new UNWRAP_SINGLE_VALUE_ARRAYS DeserializationFeature

Merged upstream before pull request so auto merge works