[cdi-dev] Merging JSR-330 into CDI