Addendum patch for HDFS-7172. Contributed by Chris Nauroth.
YARN-2613. Support retry in NMClient for rolling-upgrades. (Contributed by Jian He)
YARN-1972. Added a secure container-executor for Windows. Contributed by Remus Rusanu.
commit ba7f31c2ee8d23ecb183f88920ef06053c0b9769 is the corresponding trunk commit, this is a slightly different patch for branch-2.
YARN-2446. Augmented Timeline service APIs to start taking in domains as a parameter while posting entities and events. Contributed by Zhijie Shen.

(cherry picked from commit 9e40de6af7959ac7bb5f4e4d2833ca14ea457614)

Conflicts:
	hadoop-yarn-project/CHANGES.txt