Merge "Configure the ec2 zone explicitly"