Merge branch 'TINKERPOP-2409' into 3.4-dev