Compat with test-kitchen master.

Also for quality-of-life it adds the more standard EC2 environment variable names.