OWB-751 backporting OWB-750

git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/branches/owb_1.1.x@1429340 13f79535-47bb-0310-9956-ffa450edef68