SHDP-353 Remove version 1 specific code
SHDP-368 Fix failing ToolTests on first run against empty hdfs

- this usually worked dependening on ordering of tests