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