Refs #5377 - Working on Pulp 2.4 tests
Merge pull request #4061 from daviddavis/pulp-2.4-tests

Working on getting pulp 2.4 tests green