Fixes related to a few issues in the locked root account test I somehow managed to overlook in the initial commit. (cherry picked from commit 209bdd6911) (cherry picked from commit 08ae3613fe)
209bdd6911
08ae3613fe