Adding support for pulp 2.2
Merge pull request #2698 from jlsherrill/pulp2.2

Adding support for pulp 2.2