Sync setenv.sh with upstream 8.13.5 (LTS)#357

oranenj merged 3 commits intovoxpupuli:mastervoxpupuli/puppet-jira:masterfrom

oranenj:template-syncoranenj/puppet-jira:template-syncCopy head branch name to clipboard