TOOLS-198 allow use-new-tools to switch MSI binary path locations
Merge remote-tracking branch 'upstream/master'