RAT-162:
Integrated patch from Andrew Gaul, reorganized imports.


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