Update the config file

Noticed that some of the ec2 options no longer appear, so I ran
tox to update the config file.

Change-Id: I886d76f9d1201bdbb066b76928de7fe6244dfb58
Merge "Update the config file"