HDFS-5649. Unregister NFS and Mount service when NFS gateway is shutting down. Contributed by Brandon Li

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556405 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5726. Fix compilation error in AbstractINodeDiff for JDK7. Contributed by Jing Zhao.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556433 13f79535-47bb-0310-9956-ffa450edef68
YARN-1568. Rename clusterid to clusterId in ActiveRMInfoProto (kasha)

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