YARN-2735. diskUtilizationPercentageCutoff and diskUtilizationSpaceCutoff are initialized twice in DirectoryCollection. (Zhihai Xu via kasha)

(cherry picked from commit 061bc293c8dd3e2605cf150568988bde18407af6)
HDFS-7381. Decouple the management of block id and gen stamps from FSNamesystem. Contributed by Haohui Mai.
YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so as to make them work correctly. Contributed by Wangda Tan.

(cherry picked from commit 0fd97f9c1989a793b882e6678285607472a3f75a)
HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write. Contributed by Brandon Li

(cherry picked from commit 99d9d0c2d19b9f161b765947f3fb64619ea58090)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
YARN-570. Time strings are formated in different timezone. (Akira Ajisaka and Peng Zhang via kasha)

(cherry picked from commit 840b13110d63d7e062cefd4b993cc7dea44aed8d)
HDFS-7389. Named user ACL cannot stop the user from accessing the FS entity. Contributed by Vinayakumar B.

(cherry picked from commit 163bb55067bde71246b4030a08256ba9a8182dc8)
HDFS-7375. Move FSClusterStats to o.a.h.h.hdfs.server.blockmanagement. Contributed by Haohui Mai.
YARN-1964. Create Docker analog of the LinuxContainerExecutor in YARN
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2