CONN-1074:Fix formatting in xml files