GERONIMO-6458 adopt cdi-1.1 changes


git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/trunk@1476380 13f79535-47bb-0310-9956-ffa450edef68