Merge "jobqueue: clean up JobQueueDB::getCacheKey() to use makeGlobalKey()"