Cherry picks for katello 1.3