correct order of xml elements, related fdo#45266

(cherry-picked from a26222f5af55e8ffe9784dd411485d3c5c72e983)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

Change-Id: I03ea0e5bb064222e50dc08a682091ec3e23bf11d