Conflicts: core/pom.xml core/src/main/java/hudson/model/Node.java test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java