Merge "Refactor OSCreds to leverage kwargs instead of named parameters."