Fix SLF when x XOR y is specified (bug #21488)

f979609ccfa5 assumed that x and y always occur together
Add testcase for bug #21488
Merge branch 'master' of github.com:wesnoth/wesnoth-old