Merge r1615270 from trunk. YARN-2343. Improve NMToken expire exception message. Contributed by Li Lu

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