SI-7074 Fix xml attribute sorting