2 files changed, 6 insertions, 2 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
index 21bb193ef93..169b1c8557b 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
@@ -13,7 +13,6 @@ import org.w3c.dom.NamedNodeMap;
 import javax.xml.transform.TransformerException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java
index 2cc5e1ac4e2..cf391f2dd0e 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java
@@ -101,7 +101,12 @@ public class Xml {
         }
         StringWriter writer = new StringWriter();
         transformer.transform(new DOMSource(document), new StreamResult(writer));
-        return writer.toString();
+        String[] lines = writer.toString().split("\n");
+        var b = new StringBuilder();
+        for (String line : lines)
+            if ( ! line.isBlank())
+                b.append(line).append("\n");
+        return b.toString();
     }
 
     static String documentAsString(Document document) throws TransformerException {