Merge branch 'fix-avs-firmwarepolicy-indexes' into 'master'

Add platform to FirmwarePolicy index

See merge request !6447

(cherry picked from commit 842b6e2a)

a0652458 Add platform to FirmwarePolicy index
7558de19 Fix black.
6 jobs for !6449 with cherry-pick-842b6e2a in 25 minutes and 59 seconds (queued for 7 seconds)
latest merge request