Merge "Remove HAProxy listen for Nova EC2 API"