Fixing test failures

core/src/main/java/hudson/tasks/MailMessageIdAction.java

@@ -26,7 +26,7 @@ package hudson.tasks;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
 import hudson.model.Action;
 import hudson.model.Run;
-import hudson.util.xstream.LRUStringConverter;
+import hudson.util.LRUStringConverter;
 
 /**
  * Remembers the message ID of the e-mail that was sent for the build.

core/src/test/java/hudson/slaves/NodeListTest.java

@@ -123,7 +123,7 @@ public class NodeListTest extends TestCase {
 
             String xml = FileUtils.readFileToString(tmp);
             System.out.println(xml);
-            assertEquals(4,xml.split("\n").length);
+            assertEquals(6,xml.split("\n").length);
 
             NodeList back = (NodeList)x.read();