Expand the fix in 1636063 to include imports of static fields.

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