HADOOP-9976. Different versions of avro and avro-maven-plugin (Karthik Kambatla via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526667 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5513. ConcurrentModificationException in JobControl. Contributed by Robert Parker


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526688 13f79535-47bb-0310-9956-ffa450edef68
Delete the missed file in r1525104

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526728 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-320-trunk-gd