previously valid amazon environment now invalid?

[Nate Finch]

If I do juju status with an unbootstrapped amazon environment, I get this:

/home/nate/src/github.com/juju/juju master$ juju status
ERROR Unable to connect to environment "amazon".
Please check your credentials or use 'juju bootstrap' to create a new
environment.

Error details:
invalid EC2 provider config: control-bucket: expected string, got nothing

The error details seem to be incorrect.  control-bucket is not required
(and in fact, I can bootstrap just fine with this configuration).

Here's my config:

  ## https://juju.ubuntu.com/docs/config-aws.html
  amazon:
    type: ec2
    admin-secret: elided
    # globally unique S3 bucket name
    # control-bucket: juju-c2feecf0b1cd9ef0d4ea241dd90e10c3
    # override if your workstation is running a different series to which
you are deploying
    default-series: trusty
    agent-metadata-url: "http://juju-dist.s3.amazonaws.com/testing/tools"
    enable-os-upgrade: false
    logging-config: "<root>=DEBUG"
    # bootstrap-timeout: 3600
    # region defaults to us-east-1, override if required
    # region: us-east-1
    # Usually set via the env variable AWS_ACCESS_KEY_ID, but can be
specified here

I don't know when this changed, but something's wrong here.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/juju-dev/attachments/20150427/ce4a1ea5/attachment.html>