Merge "jobqueue: use more sensible metric key names"