TBD-1306 / TBD-1311: fix classpath problems for hdfs/hbase