Bug 1081975
removed oo-admin-ctl-team to be done in a separate pull request
Merge branch 'global-teams' of github.com:lnader/origin-server into global-teams