svn merge -c 1612285 FIXES: YARN-2045. Data persisted in NM should be versioned. Contributed by Junping Du


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