Merge branch '2.2.x' into 2.3.x

Author: philwebb

src/checkstyle/checkstyle-suppressions.xml

@@ -46,5 +46,5 @@
 	<suppress files="[\\/]src[\\/]intTest[\\/]java[\\/]" checks="SpringJavadoc" message="\@since" />
 	<suppress files="LinuxDomainSocket" checks="FinalClass" message="SockaddrUn" />
 	<suppress files="BsdDomainSocket" checks="FinalClass" message="SockaddrUn" />
-	<suppress files="StringSequence" checks="SpringMethodVisibility"/>
+	<suppress files="StringSequence" checks="SpringMethodVisibility" message="isEmpty"/>
 </suppressions>