Conflicts: WebContent/VAADIN/themes/base/common/common.scss server/src/com/vaadin/server/VaadinServlet.java server/src/com/vaadin/ui/AbstractField.java src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java tests/testbench/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java tests/testbench/com/vaadin/tests/components/table/TableReduceContainerSize.java tests/testbench/com/vaadin/tests/tickets/Ticket8291.java uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java uitest/src/com/vaadin/tests/tickets/Ticket8291.java uitest/test.xml