Cleaner initial and final cycle time logic at start-up.

This replaces #745.  No functional difference just cleaner logic: override the suite definition after parsing, if CLI args are found. @matthewrmshin - please review.  I might put in another pull request for other good changes on #745.