Pull in latest changes enabling EC2 security group support