Merge branch '1.1.x' into 1.2.x

Conflicts:
	spring-boot-dependencies/pom.xml

spring-boot-dependencies/pom.xml

@@ -120,7 +120,7 @@
 		<spring-loaded.version>1.2.1.RELEASE</spring-loaded.version>
 		<spring-mobile.version>1.1.3.RELEASE</spring-mobile.version>
 		<spring-plugin.version>1.1.0.RELEASE</spring-plugin.version>
-		<spring-security.version>3.2.6.RELEASE</spring-security.version>
+		<spring-security.version>3.2.7.RELEASE</spring-security.version>
 		<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
 		<spring-social.version>1.1.0.RELEASE</spring-social.version>
 		<spring-social-facebook.version>1.1.1.RELEASE</spring-social-facebook.version>