Merge "Factor up config dependent credential classes"