Merge 1.5.3 changes back to master.

Dockerfile

@@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y firefox
 ARG MAVEN_ARGUMENTS="-DskipTests=false"
 
 # Versions of JDBC drivers to bundle within image
-ARG MSSQL_JDBC_VERSION=12.2.0
+ARG MSSQL_JDBC_VERSION=9.4.1
 ARG MYSQL_JDBC_VERSION=8.0.33
 ARG PGSQL_JDBC_VERSION=42.6.0