merged bug fixes from 6.3 branch

svn changeset:13187/svn branch:6.4

diff --cc src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index bd30bac7390ba007a9738cab80e93a24d98a489e,f62da54ff13b7817af64a127f8b51f164de3bcea..9629ea4a954b848f37a8d2b7190ff00755bc7d23
--- 1/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
--- 2/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@@ -4266,8 -2968,8 +4267,9 @@@ public class VScrollTable extends FlowP
       */
      private void setContainerHeight() {
          if (height != null && !"".equals(height)) {
-             int contentH = getOffsetHeight() - tHead.getOffsetHeight()
-                     - tFoot.getOffsetHeight();
+             int contentH = getOffsetHeight();
+             contentH -= showColHeaders ? tHead.getOffsetHeight() : 0;
++            contentH -= tFoot.getOffsetHeight();
              contentH -= getContentAreaBorderHeight();
              if (contentH < 0) {
                  contentH = 0;