Updated the PR to simplify the logic.  Refer to the following commit for more details: 77e2efa .

It is possible that the tests on the PR will no longer pass.  This is due to rebasing and pulling in changes from a recent merge to the upstream/master.  Unfortunately, with those changes came a new runcible with api changes that were not included in the katello merge resulting in breakage of content promotion, content view publish/refresh...etc.  Will need do another merge from master->content_views to address that; however, I don't want to muddy this PR with that merge.