Many thanks to Andrew Nicols as this patch is based on his
proposal. Thanks Andrew.

Conflicts:
	lib/bennu/readme_moodle.txt

Merge branch 'm28_MDL-51363_Fix_Default_Settings_1x_Restore' of git://github.com/scara/moodle into MOODLE_28_STABLE

This patch fixes the shibboleth redirect url generation, that can create invalid url
if the shibboleth logout_handler setting has a parameter generating two parameters
with (?) instead of (&).

Thanks to Matteo Boni for the proposed solution.