Merge pull request #3728 from pkolbus/issue-3647-2.16

Backport 2.16: Restore retry in rsa_prepare_blinding()