NOJIRA: Clean up xmlmerge configurations to reduce confusion.