HPCC-11452 Ensure control:queries does not split lines

Additional fixes needed for 5.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5904 from richardkchapman/control-queries-format-extra

HPCC-11452 Ensure control:queries does not split lines

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>