OWB-856: Implemented the behavior of the 1.1.x branch

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