TOMEE-1280 myfaces 2.2 + fixing style + removing useless code from CdiScanner

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