* changed from "all" to "annotated" cdi.
Merge origin/master