HADOOP-10609. .gitignore should ignore .orig and .rej files. (kasha)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1595411 13f79535-47bb-0310-9956-ffa450edef68
YARN-2066. Wrong field is referenced in GetApplicationsRequestPBImpl#mergeLocalToBuilder (Contributed by Hong Zhiguo)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1595413 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10614. CBZip2InputStream is not threadsafe (Xiangrui Meng via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1595521 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'apache/trunk' into archival