Fix issues with latest Vaadin gradle plugin