Merge "Refactor access to env variables in certservice-client"