DBClientBase::_upconvertRequest currently attaches $tenant to outgoing requests if a tenantId exists and isAlwaysAppendDollarTenant_forTest is set. This ticket covers removing isAlwaysAppendDollarTenant_forTest, and changing this code to attach an unsigned security token to the request instead of appending $tenant