Test environment variables in Diego and CLI

Signed-off-by: David Wadden <dwadden@pivotal.io>