Merge pull request #9446 from gilles-peskine-arm/psa_generate_key_custom-development-forward_then_remove

psa_generate_key_custom