Merge "Remove internal locking from JobStatus." into nyc-dev