HDFS-5069 Include hadoop-nfs and hadoop-hdfs-nfs into hadoop dist for NFS deployment. Contributed by Brandon Li

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1516232 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4994. Audit log getContentSummary() calls. Contributed by Robert Parker.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1516237 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5466. Changed MR AM to not promote history files of intermediate AMs in case they are exiting because of errors and thus help history-server pick up the right history file for the last successful AM. Contributed by Jian He.


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