forward merge AE-273 (aka: HADOOP-9487) into 2.0.5-alpha-vcc
Merge pull request #25 from VertiPub/forward_merge_HADOOP-9487

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