Merge to allow settings for HDFS tmp directory