Merge remote-tracking branch 'upstream/master' into editStringsjavafx

* upstream/master:
  Bump mockito-core from 2.23.4 to 2.24.0 (#4626)
  Bump mysql-connector-java from 8.0.14 to 8.0.15 (#4627)

build.gradle

@@ -120,7 +120,7 @@ dependencies {
     antlr4 'org.antlr:antlr4:4.7.2'
     compile 'org.antlr:antlr4-runtime:4.7.2'
 
-    compile 'mysql:mysql-connector-java:8.0.14'
+    compile 'mysql:mysql-connector-java:8.0.15'
 
     compile 'org.postgresql:postgresql:42.2.5'
 
@@ -170,7 +170,7 @@ dependencies {
     testCompile 'org.junit-pioneer:junit-pioneer:0.3.0'
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.1'
-    testCompile 'org.mockito:mockito-core:2.23.4'
+    testCompile 'org.mockito:mockito-core:2.24.0'
     testCompile 'com.github.tomakehurst:wiremock:2.21.0'
     testCompile 'org.assertj:assertj-swing-junit:3.8.0'
     testCompile 'org.reflections:reflections:0.9.11'