MDL-41075 Fix errors on Choose... options in Moodle.

Conflicts:
	badges/award.php