Fix race condition in team creation
Merge pull request #5941 from derekwaynecarr/issue_1162128

Merged by openshift-bot