Merge branch '2.1.x' into 2.2.x

Author: wilkinsona

pom.xml

@@ -384,7 +384,7 @@
 			<plugin>
 				<groupId>com.gradle</groupId>
 				<artifactId>gradle-enterprise-maven-extension</artifactId>
-				<version>1.5.2</version>
+				<version>1.5.3</version>
 				<configuration>
 					<gradleEnterprise>
 						<plugins>