changes to explicitly advance the modals after google oauth credentials ...

...are received and to completely remove the problematic connecting state #1841

A good chunk of this diff is the byproduct of cleaning up unused arguments to constructors...will comment.
This is one of the key changes - just explicitly advance the modal here where we know we're in the setup sequence instead of relying on more ambiguous code in XmppConnector