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

...nk for HDFS-4451 to the 2.0.2-alpha release.

https://issues.apache.org/jira/browse/HDFS-4451 for more info.