(#20930) fix jenkins green on failure bug

https://github.com/puppetlabs/puppet-acceptance/commit/d4fc92e5bfdfdc078c8039f01c404448151e806a introduced a bug that causes jenkins to report green no matter the results of the harness test run.  This fixes that along with re-organizing the failure handling in cli.rb to make it more logical and (hopefully) readable.