[PATCH 15/19] Tighten up management of passphrases across Storage resets. (#865364)