Manual Cherry-pick to release-1.3-Resolve merge conflicts#749

themr0c merged 3 commits intoredhat-developer:release-1.3redhat-developer/red-hat-developers-documentation-rhdh:release-1.3from

jmagak:Manual-cherry-pick-to-release-1.3-rhdh-pull-661jmagak/red-hat-developers-documentation-rhdh:Manual-cherry-pick-to-release-1.3-rhdh-pull-661Copy head branch name to clipboard