Merge r1523149 from branch-2 to branch-2.1-beta YARN-1116. Populate AMRMTokens back to AMRMTokenSecretManager after RM restarts (Jian He via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1523151 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9945. HAServiceState should have a state for stopped services. Contributed by Karthik Kambatla.


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