Add prep_jid to returners

Necessary for returners to work correctly as master external job cache.
Linting
Last lint hopefully :]
Even more linting
Merge pull request #16521 from cachedout/gen_jid

Add prep_jid to returners