Ref #8659 - fork form katello installer 114a91059cc0ec0259de9de027f4160d...

...067500ba