Clean up imports in gremlin-test and gremlin-java.