fix: trust ring get salt fails for 2% users causing cred store fails#2657

abose wants to merge 2 commits intomainphcode-dev/phoenix:mainfrom

zphcode-dev/phoenix:zCopy head branch name to clipboard