YARN-706. Fixed race conditions in TestFSDownload. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1485028 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485029 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd
Merge remote branch 'origin/branch-2-gd' into fb-HADOOP-7435-branch-2-gd