Refs #8509 #8501 Ensure the Teams appear in the Team tab after conversion

We need to assign the roles to the Teams before we assign the members
to the Teams, otherwise they do not appear in the Team tab.