Back port Kyle's tool download fixes from default.
Merge next-stable fixes to tool downloader.