XD-901 issues with webhdfs classpath

Solves XD-901 and XD-578