forward merge AE-273 (aka: HADOOP-9487) into 2.0.5-alpha-vcc