Merge #698 Use ec2_endpoint from krumts