Manual Cherry-picking for #538#617

hmanwani-rh merged 3 commits intoredhat-developer:1.2.xredhat-developer/red-hat-developers-documentation-rhdh:1.2.xfrom

pabel-rh:manual-cp-538-to-1.2.xpabel-rh/red-hat-developers-documentation-rhdh:manual-cp-538-to-1.2.xCopy head branch name to clipboard