Merge branch 'master' into issue-1319

Author: gracekarina

pom.xml

@@ -293,7 +293,7 @@
         <testng-version>6.14.2</testng-version>
         <jmockit-version>1.35</jmockit-version>
         <wiremock-version>2.15.0</wiremock-version>
-        <surefire-version>2.21.0</surefire-version>
+        <surefire-version>2.22.2</surefire-version>
         <commons-lang-version>3.2.1</commons-lang-version>
         <jackson-version>2.10.2</jackson-version>
     </properties>