Merge "Fix resource_registry path in enable-internal-tls"