Merge commit '39848'

Conflicts:
	WebContent/release-notes.html
	src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java

2 files changed, 4 insertions, 6 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java
index 299bb7e815..c55f743fe2 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java
@@ -1846,11 +1846,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
         isNewBody = false;
 
         if (firstvisible > 0) {
-            // FIXME #7607
-            // Originally deferred due to Firefox oddities which should not
-            // occur any more. Currently deferring breaks Webkit scrolling with
-            // relative-height tables, but not deferring instead breaks tables
-            // with explicit page length.
+            // Deferred due to some Firefox oddities
             Scheduler.get().scheduleDeferred(new Command() {
                 @Override
                 public void execute() {
@@ -5959,7 +5955,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
             // overflow hack here to shake body element a bit.
             // We must run the fix as a deferred command to prevent it from
             // overwriting the scroll position with an outdated value, see
-            // #7606.
+            // #7607.
             Scheduler.get().scheduleDeferred(new Command() {
                 public void execute() {
                     Util.runWebkitOverflowAutoFix(scrollBodyPanel.getElement());
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
index b123af95bb..1eb6134128 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
@@ -201,6 +201,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
      */
     public static final String PORTAL_PARAMETER_VAADIN_THEME = "vaadin.theme";
 
+    public static final String WRITE_AJAX_PAGE_SCRIPT_WIDGETSET_SHOULD_WRITE = "writeAjaxPageScriptWidgetsetShouldWrite";
+
     // TODO some parts could be shared with AbstractApplicationServlet
 
     // TODO Can we close the application when the portlet is removed? Do we know