removed oo-admin-ctl-team to be done in a separate pull request