Merge branch 'stable-2.5' into devel-2.5

* stable-2.5:
  jqueue: Fix epylint errors introduced in 37d76f1e
  jqueue: Fix deadlock between job queue and dependency manager

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>