Simplify patternsets where possible
Avoid pattern sets ending in "/*" as much as possible as they usually result in JARs containing empty packages with the contents of the package in a different JAR

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1570114 13f79535-47bb-0310-9956-ffa450edef68
Follow up to r1570114
Need to include *.properties as well as *.class

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