changes made while fixing 976561 in the pulp repo
Merge pull request #285 from pulp/jconnor-976561-changes

changes made while fixing 976561 in the pulp repo
Merge pull request #286 from pulp/pulp-2.2

Pulp 2.2