[apache merge] 20141108

[apache merge] Merge from apache/hadoop, 20141108.