YARN-766. TestNodeManagerShutdown in branch-2 should use Shell to form the output path and a format issue in trunk. (Contributed by Siddharth Seth)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1593660 13f79535-47bb-0310-9956-ffa450edef68