HADOOP-9660. Addendum patch to avoid using Guava. Contributed by Enis Soztutar.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1-win@1499793 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9687. TestJobTrackerQuiescence and TestFileLengthOnClusterRestart failed caused by incorrect DFS path construction on Windows. Contributed by Xi Fang.

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