Merge commit '691580e36b1b5a04e1f18004783b28ca9892fa31' into master

691580e Update TestBench dependency to 3.1.2

Conflicts:
	uitest/ivy.xml

Change-Id: Ic2a767595791f0730a209d833f6b9d0fcaaa4efe

diff --cc uitest/ivy.xml
index 0508d10b57ce95325f0feb6a01be6132f2b9278a,352cd89f2e3046e6810c1d5fb7400b94e60103ed..6270ec54de842fd979ebdb3eee074e032f3fc4b6
--- 1/uitest/ivy.xml
--- 2/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@@ -83,11 -83,7 +83,10 @@@
          <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
              conf="build,ide -> default" />
          <dependency org="com.vaadin" name="vaadin-testbench"
-             rev="3.1.1" conf="build-provided,ide -> default" />
+             rev="3.1.2" conf="build-provided,ide -> default" />
 +        <!-- This should be removed once tests have been updated to use lang3 -->
 +        <dependency org="commons-lang" name="commons-lang"
 +            rev="2.6" conf="build,ide -> default" />
- 
      </dependencies>
  
  </ivy-module>