Merge from trunk. HDFS-6787. Remove duplicate code in FSDirectory#unprotectedConcat. Contributed by Yi Liu.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615623 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Sam Liu via Eric Yang)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615703 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6451. Merging change r1615702 from trunk

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