Code Review Request

[Wang Tianhong]

Please help to review patch:
https://issues.apache.org/jira/browse/HADOOP-9435
https://issues.apache.org/jira/browse/HADOOP-9440

Thanks