Merge branch 'data-directory-map-fix' into 'master'

Data Directory Map Fix

See merge request DM/data-management!4

src/python/dm/aps_beamline_tools/gui/genParamsTab.py

@@ -82,7 +82,8 @@ class GenParamsTab(QWidget):
                     continue
                 original = entry.split(':')[0]
                 replacement = entry.split(':')[1]
-                dirPath = dirPath.replace(original,replacement)
+                if dirPath.startswith(original):
+                    dirPath = dirPath.replace(original,replacement)
         return self.assembleUrl(scheme, host, port, dirPath)
 
     @classmethod

src/python/dm/common/cli/dmCli.py

@@ -301,7 +301,8 @@ class DmCli(object):
                     continue
                 original = entry.split(':')[0]
                 replacement = entry.split(':')[1]
-                dirPath = dirPath.replace(original,replacement)
+                if dirPath.startswith(original):
+                    dirPath = dirPath.replace(original,replacement)
         return self.assembleUrl(scheme, host, port, dirPath)
 
     @classmethod