MDL-37033 Environment - Fix indenting in XML
MDL-38659 environment: fix incorrect feedback messages