[CA-123912] Run the uninstaller fix before uninstalling legacy tools

Signed-off-by: Ben Chalmers <Ben.Chalmers@citrix.com>