correct order of xml elements, related fdo#45266

Change-Id: I03ea0e5bb064222e50dc08a682091ec3e23bf11d
remove invalid attribute that is not read anyway

Change-Id: Id7770ffda49ba7bc0ebc780c67c56b81152213f7
the xlink:type attribute is mandatory, related fdo#79449

Change-Id: I03c4217f786bc10aa915780dc10ea52d94019b6e