HADOOP-9507. LocalFileSystem rename() is broken in some cases when destination exists. Contributed by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1507429 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5419. TestSlive is getting FileNotFound Exception. Contributed by Robert Parker


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1507486 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-318-trunk-gd