Issue 3184 consolidate verify with primary

@ozten or @seanmonstar, could you guys review this one?

I worked off of the PR that @arlolra submitted to consolidate the "upgrade_primary_user" and "verify_primary_user" modules. These two modules were very similar to each other, so we collapsed them into one.

The selenium tests are still happy, so I am fairly confident that I did not change functionality. There is one user facing change, this is a fix for #3357. A user now sees the "transitionToPrimary" messaging if the user is not signed into Persona but their account is being upgraded.

I removed the "upgraded_primary_user"->"primary_user"->"verify_primary_user" sequence if the user is not signed in to their primary. Instead, I redirect directly to the primary, which picks up as it used to.

An ephemeral instance, "consolidation.personatest.org" is already set up.

And a final thanks goes to @arlolra for submitting the initial PR and getting this ball rolling. His changes made my work much easier.