Merge branch '1.4.x' into 1.5.x

Author: snicoll

spring-boot-dependencies/pom.xml

@@ -168,7 +168,7 @@
 		<spring-retry.version>1.2.0.RELEASE</spring-retry.version>
 		<spring-security.version>4.2.2.RELEASE</spring-security.version>
 		<spring-security-jwt.version>1.0.7.RELEASE</spring-security-jwt.version>
-		<spring-security-oauth.version>2.0.13.RELEASE</spring-security-oauth.version>
+		<spring-security-oauth.version>2.0.14.RELEASE</spring-security-oauth.version>
 		<spring-session.version>1.3.1.RELEASE</spring-session.version>
 		<spring-social.version>1.1.4.RELEASE</spring-social.version>
 		<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version>