Merge pull request #183 from pulp/mhrivnak-955172

955172 - Removing rhsm from our repo and now using the regular python-rh...
Merge branch 'pulp-2.1'