[release-4.2] Bug 1763205: revert #1177 and fix common templates in MCs#1202

openshift-merge-robot merged 2 commits intoopenshift:release-4.2openshift/machine-config-operator:release-4.2from

openshift-cherrypick-robot:cherry-pick-1189-to-release-4.2openshift-cherrypick-robot/machine-config-operator:cherry-pick-1189-to-release-4.2Copy head branch name to clipboard