SI-7591 Minor cleanups
SI-7591 Make s.t.p.n.ConsoleRunner use s.t.c.CommandLine

Before this change s.t.n.u.CommandLine was used instead.