Merge "Add NEUTRON_ENDPOINT_SERVICE_NAME variable to set service name"