DiscoveryWithServiceDisruptions: some more java docs and todos