Merge pull request #2053 from ministat/hj_TINKERPOP-2941

[TINKERPOP-2941] Stop deleting the output location if it is not empty