Support multiple credential types in DTRS

Opening PR so tests will run, and for review.