Better sample jobs.

The actual jobs we have configured now look quite different to the
template folk are advised to use. I think this is more accurate.

Change-Id: I1d94737d8a448d78626633bdef670c4b084c2263
Merge "Better sample jobs."