Merge branch 'rbarlow-1128831' into pulp-2.4
Raise the python-rhsm release for builder.py.

We have some tag conflicts in our repository, so we need to raise the
release on python-rhsm to get the tags sorted out so we can build
python-rhsm for EL 7.
Merge branch 'rbarlow-bump_rhsm_release'