Merge of r29839 - specify units in job timeout message