Added max_teams capability
Merge pull request #4857 from lnader/master

Merged by openshift-bot