Add support for multiple teams with the same primary name

Change-Id: Ie70c29e16cbe41081fe13c1a1c0ae084cbef863f
Merge remote-tracking branch 'Joe030984/master' into fix_team_arg
Let --team accept a team name or id

We can't rely on the team name to be unique, so we allow an id to be
specified. The id is printed along with the name in the list of options.
The beginning of the team name is still accepted.