Minor compatibility fixes for bootstrap_psexec
Merge pull request #8244 from scottp-dpaw/develop

Minor compatibility fixes for bootstrap_psexec