merge back DELTASPIKE-97 and DELTASPIKE-98
------------------------------------------
Key: EXTCDI-268
URL: https://issues.apache.org/jira/browse/EXTCDI-268
Project: MyFaces CODI
Issue Type: Task
Affects Versions: 1.0.4
Reporter: Gerhard Petracek
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
