Prep for merge

Author: labkey-jeckels

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java

@@ -4723,7 +4723,7 @@ private static FileLike getLocalFile(Container container, String fileName) throw
             }
             else
             {
-                return FileSystemLike.wrapFile(fileRoot.resolve(fileName));
+                return FileSystemLike.wrapFile(fileRoot).resolveChild(fileName);
             }
         }
     }