Back out temporary fix for HDFS-4451 and apply exact patch merged to trunk for HDFS-4451 to the 2.0.2-alpha release.

https://issues.apache.org/jira/browse/HDFS-4451 for more info.
Merge pull request #8 from VertiPub/jb_hdfs_4451

Back out temporary fix for HDFS-4451 and apply exact patch merged to tru...