master: Revert "master: Revert "master: Changes to env" This reverts commit abc05aa9ea630df4c0462dea2b4d2c98845fa993." This reverts commit d7c750be01acb76ec8fc2325fbff1c47239f87b5.
master: Revert "master: Revert "master: Changes to env" This reverts commit abc05aa9ea630df4c0462dea2b4d2c98845fa993." This reverts commit d7c750be01acb76ec8fc2325fbff1c47239f87b5.

DBCDK/OpenSearch-webservice,DBCDK/OpenSearch-webservice,DBCDK/OpenSearch-webservice,DBCDK/OpenSearch-webservice