This is a follow up from MDL-31072 where we've integrated query improvements to MOODLE_22_STABLE and master but only integrated non-unique indexes into master.

I think it should be ok to backport these indexes as they aren't unique.