Merge remote-tracking branch 'upstream/master' into rwroute_new_base_costs

Author: eddieh-xlnx

src/com/xilinx/rapidwright/util/VivadoTools.java

@@ -305,7 +305,7 @@ public static String reportRouteStatus(String netName, Path dcp, Path workdir, b
 
     private static String createTclDCPLoadCommand(Path dcp, boolean encrypted) {
         if (encrypted) {
-            Path tclFileName = FileTools.replaceExtension(dcp.getFileName(), EDIFTools.LOAD_TCL_SUFFIX);
+            Path tclFileName = FileTools.replaceExtension(dcp, EDIFTools.LOAD_TCL_SUFFIX);
             return "source {" + tclFileName + "}; ";
         } else {
             return "open_checkpoint {" + dcp + "}; ";