Merge "Support SSL and trace params in get_credentials"