Merge "OpenStack HTTPS Endpoints support"