Merge changes from origin/7.1

c7ae45c Validate that the connector is enabled before triggering actions for it (#12743)
ce89a75 Created constants for tested browser versions (#12786)
f9ea9b3 Allow running tests locally by overriding runLocally() (#12786)
e70ba25 Added liferay module for building liferay.zip #12748
7c12694 Add sub directory support to sass test scanner (#12790)
39fdf66 Handle numbers in the same way if they do not have a unit (#12732)
6155d61 Disable fallback in a way compatible with Atmosphere JS 2.0.3 (#12241)
f401595 Test for pushing large chunks of data (#12567)
d41967d Skip compilation of TB2 tests if tests.tb2.skip is set
6c1ba81 Reverted button click() logic check (#12743)
779c8a0 Disable automated testing on Opera until issues are resolved (#12487, #12367, #12800)
962c1c3 Fix compilation error
7ee11a7 Remove unused test super class (#12786)
a4211dc Resolve concurrency issue in running TB3 tests
20c28aa Fixed javadoc
0d36896 Add more hax to make test work with new Atmosphere JS (#12241)
ed50200 Fix serialization issue (#12703)
dd51b7f Added more exception handling to PushHandler (#12578, #11882)
6f76840 Sass variables can now start with underscore (#12716)
ab5b20c Ticket #12727 - Panels get unnecessary scroll bars in WebKit when content is 100% wide.
361ad17 Fixed focus issue in TableMoveFocusWithSelectionTest (#12540)
ee809e5 Revert broken fix and test (#12446)

Change-Id: I71b6e3c2dc6b02845794df0934ba807d7ccac784

diff --cc server/src/com/vaadin/server/communication/ServerRpcHandler.java
Simple merge

diff --cc server/src/com/vaadin/server/communication/UidlRequestHandler.java
index 2277e1c76f2ec288335e3505fa8393bc7960e452,d52c5e9fe060cbb97f9a5d375f0b41a0ebd2bb90..cf25910fa40c1828e57d1b3a4564a6ab91c72298
--- 1/server/src/com/vaadin/server/communication/UidlRequestHandler.java
--- 2/server/src/com/vaadin/server/communication/UidlRequestHandler.java
+++ b/server/src/com/vaadin/server/communication/UidlRequestHandler.java
@@@ -56,13 -56,9 +56,14 @@@ public class UidlRequestHandler extend
  
      private ServerRpcHandler rpcHandler = new ServerRpcHandler();
  
-     private UidlWriter uidlWriter = new UidlWriter();
+     public UidlRequestHandler() {
+     }
  
 +    @Override
 +    protected boolean canHandleRequest(VaadinRequest request) {
 +        return ServletPortletHelper.isUIDLRequest(request);
 +    }
 +
      @Override
      public boolean synchronizedHandleRequest(VaadinSession session,
              VaadinRequest request, VaadinResponse response) throws IOException {

diff --cc server/src/com/vaadin/server/communication/UidlWriter.java
index a290eb4846d2d2cbd8bc9976e94bf149db215694,60933a75c2522792df8fd474d01588590bd52095..b46fbbf58af6a04f12336a337cffa9f402ce0c94
--- 1/server/src/com/vaadin/server/communication/UidlWriter.java
--- 2/server/src/com/vaadin/server/communication/UidlWriter.java
+++ b/server/src/com/vaadin/server/communication/UidlWriter.java
@@@ -106,14 -98,8 +99,11 @@@ public class UidlWriter implements Seri
  
          uiConnectorTracker.setWritingResponse(true);
          try {
 +            writer.write("\"" + ApplicationConstants.SERVER_SYNC_ID
 +                    + "\": " + uiConnectorTracker.getCurrentSyncId() + ", ");
 +
              writer.write("\"changes\" : ");
  
-             LegacyCommunicationManager manager = session
-                     .getCommunicationManager();
- 
              JsonPaintTarget paintTarget = new JsonPaintTarget(manager, writer,
                      !repaintAll);