(cherry picked from commit 300e570f) Fixes gh-2261 See gh-1259 Conflicts: spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
300e570f