Merge "Keep detailed job-ended reasons in the history ring" into pi-dev
am: 05a033fa7b

Change-Id: I09e6e26db3dd16e091d533d9b50a71f2a2838e95