Merging bugfixes to KATELLO-2.0