Someone who uses skill and tact in dealing with other people
A person, such as an ambassador, who is accredited to represent a government officially in its relations with other governments or international organisations
How often have the words bargainer and diplomat occurred in a corpus of books? (source: Google Ngram Viewer )