Restore replacement of absolute paths in env setup with variables
This reverts part of the changes introduced in MR !119 (merged) that broke relocation of Athena installation because setup.sh kept absolute paths
This reverts part of the changes introduced in MR !119 (merged) that broke relocation of Athena installation because setup.sh kept absolute paths