diff --git a/java/buildconf/ivy/ivy-suse.xml b/java/buildconf/ivy/ivy-suse.xml
index 431edaf58ef7..78ad69a90f2d 100644
--- a/java/buildconf/ivy/ivy-suse.xml
+++ b/java/buildconf/ivy/ivy-suse.xml
@@ -148,5 +148,10 @@
+
+
+
+
+
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 5a0aac9bc2a9..db3367c7862c 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -38,7 +38,6 @@
import org.cobbler.CobblerConnection;
import org.cobbler.Profile;
-import javax.annotation.Nullable;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -1459,8 +1458,8 @@ public String getDefaultVirtBridge() {
* taskomatic.
* @return the Profile associated to this ks data
*/
- @Nullable
- public Profile getCobblerObject(@Nullable User user) {
+
+ public Profile getCobblerObject(User user) {
if (StringUtils.isBlank(getCobblerId())) {
return null;
}
diff --git a/java/spacewalk-java.changes.ycedres.fix-xml-rpc-createSystemRecord b/java/spacewalk-java.changes.ycedres.fix-xml-rpc-createSystemRecord
new file mode 100644
index 000000000000..163fe8ea578a
--- /dev/null
+++ b/java/spacewalk-java.changes.ycedres.fix-xml-rpc-createSystemRecord
@@ -0,0 +1 @@
+- Fixes createSystemRecord XML-RPC API call so the Cobbler UID is persisted