OWB-344 fix Context map and class-name-conflict detection


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