Merge branch '1.2.x'

Conflicts:
	spring-boot-dependencies/pom.xml

spring-boot-dependencies/pom.xml

@@ -98,17 +98,17 @@
 		<liquibase.version>3.3.2</liquibase.version>
 		<log4j.version>1.2.17</log4j.version>
 		<log4j2.version>2.1</log4j2.version>
-		<logback.version>1.1.2</logback.version>
+		<logback.version>1.1.3</logback.version>
 		<mariadb.version>1.1.8</mariadb.version>
 		<mockito.version>1.10.19</mockito.version>
 		<mongodb.version>2.12.5</mongodb.version>
 		<mysql.version>5.1.34</mysql.version>
-		<reactor.version>1.1.5.RELEASE</reactor.version>
+		<reactor.version>1.1.6.RELEASE</reactor.version>
 		<reactor-spring.version>1.1.3.RELEASE</reactor-spring.version>
 		<sendgrid.version>2.1.0</sendgrid.version>
 		<servlet-api.version>3.1.0</servlet-api.version>
 		<simple-json.version>1.1.1</simple-json.version>
-		<slf4j.version>1.7.10</slf4j.version>
+		<slf4j.version>1.7.11</slf4j.version>
 		<snakeyaml.version>1.14</snakeyaml.version>
 		<solr.version>4.7.2</solr.version>
 		<spock.version>0.7-groovy-2.0</spock.version>