Merge remote-tracking branch 'origin/master' into feature-cc-psa-crypto-drivers

Close the feature-cc-psa-crypto-drivers branch.

Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: I297227e65f88844fd1651df5236ff478e0d80ebe