Merge pull request #4756 from gilles-peskine-arm/generate_psa_tests-speedup-3.0

Speed up the generation of storage format test cases