Merge pull request #4047 from jlsherrill/pulp-2.4

Refs #5377 - Fixing repository glue tests for pulp 2.4
Merge pull request #4052 from jlsherrill/pulp-2.4

Refs #5377 - fixing applicability regeneration for pulp 2.4
Refs #5377 - adapting services we restart based on pulp team advice