merge vendor handling from datasplice-client

this supports simpler config and more use cases