JUDDI-890 fixed, hopefully all content is preserved while saving, minus xml comments