Merge remote-tracking branch 'origin/6.8'

Conflicts:
	tests/test.xml

diff --cc src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
Simple merge

diff --cc tests/integration_tests.xml
Simple merge

diff --cc tests/test.xml
index dd308ce0a93b99a859a9f5d68b663facbd0c96e2,fbb0a3a019a272ef725a30dfabbcaddac745fa5e..28459c37e93b1139033927b369030f3b84ef6a04
--- 1/tests/test.xml
--- 2/tests/test.xml
+++ b/tests/test.xml
@@@ -11,7 -5,7 +11,7 @@@
        <!-- Configuration                                                      -->
        <!-- ================================================================== -->
        <!-- Browsers to use for testing -->
-       <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox10,winxp-safari5,winxp-googlechrome17,winxp-opera11" />
 -      <property name="browsers-windows" value="winxp-ie6,winxp-ie7,winxp-ie8,win7-ie9,winxp-firefox36,winxp-firefox11,winxp-safari4,winxp-safari5,winxp-googlechrome13,winxp-googlechrome18,winxp-opera1060,winxp-opera11" />
++      <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox11,winxp-safari5,winxp-googlechrome18,winxp-opera11" />
        <property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />
        <property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />