making tomee embedded shade a bit cleaner, still few things fixable but no more blocking

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