Manual cherry-pick for 1416#1438

Gerry-Forde merged 1 commit intoredhat-developer:release-1.7redhat-developer/red-hat-developers-documentation-rhdh:release-1.7from

jmagak:Manual-cherry-pick-for-1416jmagak/red-hat-developers-documentation-rhdh:Manual-cherry-pick-for-1416Copy head branch name to clipboard