Merge pull request #5306 from gilles-peskine-arm/test-missing-ret-check-202112-2.x

Backport 2.x: Missing error checks + test bug on unlikely failure