svn merge -c 1522968 FIXES: YARN-1194. TestContainerLogsPage fails with native builds. Contributed by Roman Shaposhnik


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