Katello 1.3 upgrade merge

Merging the 1.2 -> 1.3 upgrades  from master to KATELLO-1.3

Mainly validating against travis