SalesForce 20530 - merge from 4.2-dev for bad xml in job logs.