improve our tomcat7 sample and insure CDI.current().getBeanManager() works properly


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