svn merge -c 1365224 FIXES: HADOOP-8606. FileSystem.get may return the wrong filesystem (Daryn Sharp via bobby)