Merge branch '1.5.x'

spring-boot-starters/spring-boot-starter-parent/pom.xml

@@ -47,6 +47,7 @@
 				<filtering>true</filtering>
 				<includes>
 					<include>**/application*.yml</include>
+					<include>**/application*.yaml</include>
 					<include>**/application*.properties</include>
 				</includes>
 			</resource>
@@ -54,6 +55,7 @@
 				<directory>${basedir}/src/main/resources</directory>
 				<excludes>
 					<exclude>**/application*.yml</exclude>
+					<exclude>**/application*.yaml</exclude>
 					<exclude>**/application*.properties</exclude>
 				</excludes>
 			</resource>