Merge commit '5dffe132bc98853832431424da5755d8d8d820e4'

Conflicts:
	uitest/ivy.xml

Change-Id: I5fea7895be1e93a8f97c6926fc2cafb401603a49

diff --cc uitest/ivy.xml
index 6270ec54de842fd979ebdb3eee074e032f3fc4b6,91c049b551352da346e4338a304116c0903b4a4e..03b57a30e5d6407c4715636f368a93d5dd829835
--- 1/uitest/ivy.xml
--- 2/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@@ -83,10 -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.2" conf="build-provided,ide -> default" />
+             rev="3.1.3" 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>