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