OWB-945: Applied patch from Xavier Dury

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