Octopus jobs no longer have an UUID.
See https://github.com/NLeSC/octopus/issues/106

So use the Ocotopus job identifier as key.
Replaced usage of uuid with simple string, to prevent expectations that key will be an UUID.
Merge remote-tracking branch 'upstream/develop' into develop