Merge pull request #3924 from bensze01/deprecated_removed

Fix removal of deprecated PSA constants