Cleaning up the ec2 discovery config by re-introducing some config options