updated to vaadin cdi beta2, some workarounds needed