fix computeRelativeNamesAfterRenaming for job tbs using same prefix in name

core/src/main/java/hudson/model/Items.java

@@ -166,7 +166,7 @@ public class Items {
         while(tokens.hasMoreTokens()) {
             String relativeName = tokens.nextToken().trim();
             String canonicalName = getCanonicalName(context, relativeName);
-            if (canonicalName.startsWith(oldFullName)) {
+            if (canonicalName.equals(oldFullName) || canonicalName.startsWith(oldFullName+'/')) {
                 String newCanonicalName = newFullName + canonicalName.substring(oldFullName.length());
                 // relative name points to the renamed item, let's compute the new relative name
                 newValue.add( computeRelativeNameAfterRenaming(canonicalName, newCanonicalName, relativeName) );

core/src/test/java/hudson/model/ItemsTest.java

@@ -57,6 +57,9 @@ public class ItemsTest {
 
         assertEquals("../meu,../bu,../zo", Items.computeRelativeNamesAfterRenaming("ga", "meu", "../ga,../bu,../zo", foo ));
         assertEquals("../qux/ga,bu,zo", Items.computeRelativeNamesAfterRenaming("foo/baz", "foo/qux", "../baz/ga,bu,zo", foo_bar ));
+
+        assertEquals("foo-renamed,foo_bar", Items.computeRelativeNamesAfterRenaming("foo", "foo-renamed", "foo,foo_bar", root ));
+
     }
 
 }