Merge branch 'sh-fix-flaky-pipelines-spec' into 'master'

What does this MR do and why?

Pick !102428 (merged) into 15-5-stable-ee to fix a flakey test on FOSS which is holding up our security release.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.