8749815 Improve handling of tool versions

Authored and Committed by nickc a year ago
    Improve handling of tool versions
    
        
file modified
+9 -5
file modified
+1 -1