OWB-946: Improved generic type resolution

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