Merge -r -r583423:583424 and -r593745:593747 from 0.15 branch to 0.14 branch to fix HADOOP-2001, HADOOP-2140, and HADOOP-2169