ACCUMULO-1833 Fix merge to 1.6.0 regarding TCredentials->Credentials