TSPCleaningSolution - fixing command line and VS build warnings

(Renamed branch to bug-3029 to enable picking up the change by the CI)

Fixes bug #3029