Sync with last PSST commit
Small fix for software area discovery. Copied from SAM ENV test - https://gitlab.cern.ch/etf/cmssam/blob/master/SiteTests/testjob/tests/CE-cms-env#L154
Small fix for software area discovery. Copied from SAM ENV test - https://gitlab.cern.ch/etf/cmssam/blob/master/SiteTests/testjob/tests/CE-cms-env#L154