[Apache Merge]Merge from Apache/Hadoop, 20141110

Merge from Apache/Hadoop, 20141110