XD-1856 Add option to specify fsUri for hdfs jobs
XD-1856 formatting on merge