more ways to construct an XDIClient and XDIDiscoveryClient
more style
more updates to interceptor and contributor processing