Merge branch '2.1.x'

Closes gh-17006

Author: wilkinsona

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java

@@ -513,6 +513,7 @@ public void bindToClassShouldCacheWithGenerics() {
 		assertThat(bean.getBooleans().get("b").getValue()).isEqualTo(true);
 	}
 
+	@Test
 	public void bindToClassWithOverloadedSetterShouldUseSetterThatMatchesField() {
 		// gh-16206
 		MockConfigurationPropertySource source = new MockConfigurationPropertySource();
@@ -524,9 +525,8 @@ public void bindToClassWithOverloadedSetterShouldUseSetterThatMatchesField() {
 	}
 
 	@Test
-	public void beanProperiesPreferMatchingType() {
+	public void beanPropertiesPreferMatchingType() {
 		// gh-16206
-
 		ResolvableType type = ResolvableType.forClass(PropertyWithOverloadedSetter.class);
 		Bean<PropertyWithOverloadedSetter> bean = new Bean<PropertyWithOverloadedSetter>(
 				type, type.resolve()) {