Fixed failing OrgTests in nightly (katello and headpin)