Merge pull request #4784 from gilles-peskine-arm/psa-storage-format-test-strategy-20210511-3.0

3.0: Updates to the storage format test strategy after starting implementation