(cherry picked from commit 543a4d88d9)
543a4d88d9
resolves path problems with sudo, we already have the same change in the AWS test script. (cherry picked from commit 16260c1569)
16260c1569
(cherry picked from commit 13fbd0861b)
13fbd0861b