fixing sync hanging in pulpv2

based off this commit 4c8a60b81564474cc2c36c245a9e2897525811f6
but with a slightly different algorithm
Merge pull request #1474 from jlsherrill/pulpv2

fixing sync hanging in pulpv2
Automatic commit of package [katello-configure] release [1.3.5.pulpv2-1].
Merge pull request #1473 from ehelms/pulpv2

Pulpv2 - Merging in master and fixing a few minor conflicts.
Merge pull request #1419 from Katello/pulpv2

DO NOT MERGE   Integration with pulpv2
PulpV2 - Clean-up of authorization modules to use ActiveSupport::Concern
for clarity and consistency.