Merge "API council requested tweaks to JobInfo." into pi-dev