Merge pull request #348 from rostafiychuk/master

HadoopUtil cleanup
testDir deletion by flattenAndPutDataInFolder fixed