Port changes from 7.0.4 release#14637

rjmholt merged 3 commits intoPowerShell:masterPowerShell/PowerShell:masterfrom

rjmholt:704-port-changesrjmholt/PowerShell:704-port-changesCopy head branch name to clipboard