Merge pull request #4656 from gilles-peskine-arm/psa_key_derivation-bad_workflow-20210527-2.x

Backport 2.x: PSA key derivation bad-workflow tests