Feature/split cla

Before this can be merged, the following things need to be done:
- The package review at https://bugzilla.redhat.com/show_bug.cgi?id=969703 (not required, but preferred)
- The feature/split-teams pull request.

I decided to make this one dependent on the other pull request to ease the merging after acceptance, and because both changes are quite the same. (Decided to split them because of the package review required for this one).