removing useless code and ensuring we work on server.xml if it exists (= not custom package)

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