Merge pull request #4459 from ronald-cron-arm/psa-hash-dispatch-testing-2.x

Backport 2.x: Psa hash dispatch testing