forward merge WB-1049 (aka: HADOOP-9692) into 2.0.5-alpha branch