refs #5028 - organizations aren't a special case anymore

this should be merged **after** Katello/katello#4028

@tstrachota will you take a look at this PR and Katello/katello#4028 ?