Does not load site_user during db upgrade

Fixes #2029 by ensuring we do not attempt to load site_user during a db
upgrade.  This is a workaround because loading the site_user will fail
because of a failed user change.  Should also avoid the problem in
future.
Merge branch '2029-no-site-user-during-migration'