Allow job timeout to be updated along with status. Provide convenience method for use by workers.
Cleaned up a confusing conditional per Lamar's comment