Use dedicated staging dirs for M/R clusters
Fix TestMRJobs to avoid NPE