Merge "Fix type hints in jobqueue related classes"