Post-merge cleanup: rearrange import statements in order to isolate the test classes not available in GeoAPI 3.0.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK8@1601015 13f79535-47bb-0310-9956-ffa450edef68