Just a note: if your shell is set to something in `/usr/local` (e.g. `/usr/local/bin/zsh`), remember to set it back to `/bin/bash` before doing the move.
Yeah, I got caught by this so I was unable to open Terminal or iTerm. But using Terminal, I ran "Shell | Run Command...", entered "sudo chsh -s /bin/bash myuserid" and was then able to open a shell and move the local directory back.
Other than that, the upgrade was very smooth. Thanks for the help!