TRQ-2572. Make the --version outputs all follow the same format.