mccun934's katello-1.3 cherry-picks from master