Revert "TINKERPOP-2076 Cleanup groovy 3.0 imports"

This reverts commit 71a171523fa7570102d0ed68ee2c5de2a43b94a7.
18 files changed