Merge "Switch swift tests to use cred_provider with roles"