Follow-up fix for bug#7337.
Merge branch 'master' of git.otrs.com:otrs/otrs
Fixed bug#10099: Missing challenge token checks on customer interface.

Conflicts:
	CHANGES.md
Merge remote-tracking branch 'upstream/master' into otrs-master