Fix EC2 Requests for Endpoints that are not TLDs

E.g. OpenStack