svn merge -c r1427945 FIXES: MAPREDUCE-4884. Streaming tests fail to start MiniMRCluster due to missing queue configuration. Contributed by Chris Nauroth.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442174 13f79535-47bb-0310-9956-ffa450edef68
merge -c 1442312 from trunk to branch-2 to fix HADOOP-9276. Allow BoundedByteArrayOutputStream to be resettable. Contributed by Arun Murthy

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442316 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4462. 2NN will fail to checkpoint after an HDFS upgrade from a pre-federation version of HDFS. Contributed by Aaron T. Myers.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442378 13f79535-47bb-0310-9956-ffa450edef68