Switched to new Vaadin 7.3.3 and new cdi utils