svn merge -c 1606265 FIXES: YARN-2104. Scheduler queue filter failed to work because index of queue column changed. Contributed by Wangda Tan


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606266 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10739. Renaming a file into a directory containing the same filename results in a confusing I/O error. Contributed by chang li


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