svn merge -c 1532857 from trunk for HDFS-5283. Under construction blocks only inside snapshots should not be counted in safemode threshhold.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532858 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1532860 from trunk for adding TestOpenFilesWithSnapshot.java for HDFS-5283.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532861 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5585. TestCopyCommitter#testNoCommitAction Fails on JDK7 (jeagles)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532878 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9897. Merging change r1532880 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532883 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5586. TestCopyMapper#testCopyFailOnBlockSizeDifference fails when run from hadoop-tools/hadoop-distcp directory (jeagles)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532890 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5370. Merge 1532899 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532902 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10005. Merge 1532907 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532908 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1532915 Merging from trunk to branch-2 to fix HDFS-5346.

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