Cli: Change service handling in repository command

refs #7255
Fix output formatting for --version

refs #7245