Upgrade VaadinScope to Vaadin 7