Merge pull request #821 from fluxcd/int-set-env-vars

Merge pull request #821 from fluxcd/int-set-env-vars #2700