EXTCDI-312 improved proxy handling and cleanup

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