Updated to latest Vaadin and CDI