merge the following PRs into 6.0.0-ga#5803

TravisEz13 merged 1 commit intoPowerShell:6.0.0PowerShell/PowerShell:6.0.0from

TravisEz13:merge_6.0.0-ga_changesTravisEz13/PowerShell:merge_6.0.0-ga_changesCopy head branch name to clipboard