Merge branch 'TINKERPOP-2412' into 3.4-dev