EXTCDI-315 improved compatibility

git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/cdi/trunk@1580819 13f79535-47bb-0310-9956-ffa450edef68