Fixes for upgrade resets, tweaks to error messaging in load_pod during 1.x > 2.x upgrade