Merge branch 'devel-2.2'

* devel-2.2:
  http.client: Disable SSL session ID cache
  Crude workaround for pylint breakage

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

Makefile.am

@@ -453,6 +453,7 @@ check_python_code = \
 
 lint_python_code = \
 	ganeti \
+	ganeti/http/server.py \
 	$(dist_sbin_SCRIPTS) \
 	$(dist_tools_SCRIPTS) \
 	$(pkglib_python_scripts) \