Merge pull request #3729 from pkolbus/issue-3647-2.7

Backport 2.7: Restore retry in rsa_prepare_blinding()