Merge branch '2.1.x'

Closes gh-17084

Author: wilkinsona

src/checkstyle/checkstyle-suppressions.xml

@@ -9,7 +9,7 @@
 	<suppress files="[\\/]transaction-logs[\\/]" checks=".*" />
 	<suppress files="[\\/]target[\\/]" checks=".*" />
 	<suppress files="[\\/]build.log" checks=".*" />
-	<suppress files=".+\.[jar|git|ico|p12|svg|png]" checks=".*" />
+	<suppress files=".+\.(jar|git|ico|p12|svg|png)" checks=".*" />
 	<suppress files="eclipse[\\/]spring-boot-project.setup" checks="NoHttp"/>
 	<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
 	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />