Merge branch 'devel-2.2'

* devel-2.2:
  Fix pylint warning in http/__init__.py
  Allow SSL ciphers to be overridden in HTTP server
  jqueue: Resume jobs from “waitlock” status
  jqueue: Move queue inspection into separate function
  jqueue: Don't update file in MarkUnfinishedOps
  locking.SharedLock: Update class docstring
  If we had any errors in setup in one of the hosts, exit with non-zero
  Fix the output of the key fingerprint from binary to hex

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