merge YARN-376 from trunk. Fixes a bug which would prevent the NM knowing about completed containers and applications. Contributed by Jason Lowe.


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