Merge branch '1.4.x' into 1.5.x

spring-boot-dependencies/pom.xml

@@ -114,7 +114,7 @@
 		<jms-api.version>1.1-rev-1</jms-api.version>
 		<jmustache.version>1.12</jmustache.version>
 		<jna.version>4.2.2</jna.version>
-		<joda-time.version>2.9.4</joda-time.version>
+		<joda-time.version>2.9.5</joda-time.version>
 		<jolokia.version>1.3.5</jolokia.version>
 		<jooq.version>3.8.5</jooq.version>
 		<json.version>20140107</json.version>