OWB-850 fixed compile issues (broken since r1477205) and adjusted class names

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