forward merge WB-1049 into 2.0.5-alpha branch
Merge pull request #24 from VertiPub/forward_merge_HADOOP-9692

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