Allow pruning scenarios with different limits for default vs. long runs.
The pruned scenario list now matches the original ordering.
Tests now print with both the scenario number and the scenario args.
This should make it easier to diagnose and debug problems that effect
only certain scenarios.  Refs #1461.
Used prune_scenario limit the number of scenarios for default test runs.
Refs #1461.