This commit was SVN r18121.
Fix error message when job setup failed This commit was SVN r17724.
Remains to be tested to ensure everything came over cleanly, so please continue to withhold commits a little longer This commit was SVN r17632.