Merge pull request #122 from jlsherrill/pulp-2.4

2.4 support and some cleanup for all most remaining items
adding consumer(group) support for pulp2.4