Bug 1086128: Improve syntax to include --type and login,team name,id