Merge pull request #563 from pulp/jconnor-976561

Jconnor 976561
Merge branch 'pulp-2.2', pre-build.