Merge branch '4097-ci-test_manual_scan_deletion-timeout' into 'master'

Resolve "CI: test_manual_scan_deletion timeout"

Closes #4097 (closed)

See merge request !5906 (merged)

(cherry picked from commit bd17f067)

629581d8 Fix memory tracker manual deletion test with retry until reaching test conditions