pr 6495 suggestions#16

thomasmckay wants to merge 2 commits intoehelms:fixes-17148ehelms/katello:fixes-17148from

thomasmckay:6495-suggestionsthomasmckay/katello:6495-suggestionsCopy head branch name to clipboard