Cherry PIck HADOOP-3733 from the 2.0.2-vcc branch to the 2.0.3-vcc branch

David,

I'm attempting to merge your change from the 2.0.2 branch into the 2.0.3 branch.   Can you review this and commit it, if I've done the merge correctly.