Merge branch '1.3.x'

Conflicts:
	spring-boot-dependencies/pom.xml

spring-boot-dependencies/pom.xml

@@ -142,7 +142,7 @@
 		<spring-retry.version>1.1.2.RELEASE</spring-retry.version>
 		<spring-security.version>4.0.3.RELEASE</spring-security.version>
 		<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
-		<spring-security-oauth.version>2.0.8.RELEASE</spring-security-oauth.version>
+		<spring-security-oauth.version>2.0.9.RELEASE</spring-security-oauth.version>
 		<spring-session.version>1.1.0.RC1</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>
@@ -2283,4 +2283,4 @@
 			<id>integration-test</id>
 		</profile>
 	</profiles>
-</project>
+</project>