HADOOP-2833. Merge to 0.16 branch for 0.16.2 release. This fixes a cache consistency problem in 0.16.2