Fix the RP name showing up as undefined when a primary upgrades.

@seanmonstar or @6a68 - could I get a review of this?

An ephemeral instance is set up: idp-upgrade.personatest.org

fixes #3621