Fix the resolution of "names" given to "the tool" when they aren't actual hostnames.  #3686
Merge branch 'V8_1_1-branch'