Merge "Do not configure nginx proxy for ec2 by default"