Merge "Correctly update expedited job connectivity constraint."