[Apache Merge]Merge from apache/hadoop 20141119

Merge from apache/hadoop 20141119