Merge "Clean up JobPackageTracker dumping code." into sc-dev