(PUP-2158) Set environmentpath before testing pmt and directory envs
Merge branch 'issue/stable/pup-2158-pmt-acceptance' into stable

* issue/stable/pup-2158-pmt-acceptance:
  (PUP-2158) Set environmentpath before testing pmt and directory envs
Merge branch 'stable'

* stable:
  (PUP-2158) Set environmentpath before testing pmt and directory envs