MDL-37033 Environment - Fix indenting in XML