Merge -c 1499904 from branch-1 to branch-1.2 to fix MAPREDUCE-5351. Addedndum patch to ensure we don't incorrectly close wrong filesystems. Contributed by Sandy Ryza.