Cherry-pick several SSR/SSG fixes to 20.3.x#31910

dgp1130 merged 2 commits intoangular:20.3.xangular/angular-cli:20.3.xfrom

alan-agius4:cherry-pick-ssr-fixesalan-agius4/angular-cli:cherry-pick-ssr-fixesCopy head branch name to clipboard