Merge changes from origin/7.1

377d49e Allow configuring deployment port for TB3 tests
6779857 Updatet servlet tests to follow the same *Test naming convention
e1c38bf Avoid obsolete calendar panel renderings to avoid various NPEs. (#12504,#12667)
63f10ec Fixed compilation error in TB3 test
3e593b0 Focus selected row in Table #12540
3c842b7 added small pause to make test pass
1b7e40d Only fetch rows if there are some (#11189)
f595d05 Make the various Writers member fields instead of local variables (#12446)
4cb304d Converted broken test to TB3
2aa2fdc Handle ClientMethodInvocation serialization with JSONArray as parameter (#12532)
1449425 Also hide shim iframe of VOverlay on setVisible(false) (#12731)
25fc2f2 Fix whitespace after including a mixin (#12715)
c29ca5e Update to atmosphere javascript 2.0.3-vaadin1 (#12241, #12127)
f75164f Disable unit cache to avoid compilation issues when switching between branches
6a99730 Allow skipping TB2/TB3 tests using tests.tb2/tb3.skip

Change-Id: I5a92798e66575c2cfd1d3f761a5f00af7e83dc64

diff --cc client/src/com/vaadin/client/ui/VOverlay.java
Simple merge

diff --cc client/src/com/vaadin/client/ui/VScrollTable.java
Simple merge

diff --cc server/src/com/vaadin/server/communication/UidlRequestHandler.java
index cf25910fa40c1828e57d1b3a4564a6ab91c72298,f13199e9ae5cecf24f986eb8576e9459bfc83b4f..2277e1c76f2ec288335e3505fa8393bc7960e452
--- 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,14 -56,8 +56,13 @@@ public class UidlRequestHandler extend
  
      private ServerRpcHandler rpcHandler = new ServerRpcHandler();
  
-     public UidlRequestHandler() {
-     }
+     private UidlWriter uidlWriter = new UidlWriter();
  
 +    @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 b46fbbf58af6a04f12336a337cffa9f402ce0c94,fe7a7d42bf6daf026e4864234b76037e693790d5..a290eb4846d2d2cbd8bc9976e94bf149db215694
--- 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
@@@ -99,11 -105,11 +106,14 @@@ 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);
  

diff --cc theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
index 170d8f3e54173ac5f97047fc5803415e707fa0cb,d7662d35a8b0fff6359a42e19e8fe07b8e711e51..d7662d35a8b0fff6359a42e19e8fe07b8e711e51
mode 100644,100755..100644
--- 1/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
--- 2/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java