Merge remote-tracking branch 'upstream/python3_experimental' into python3_experimental

Conflicts:
	jenkinsapi/fingerprint.py

diff --cc README.rst
Simple merge

diff --cc jenkinsapi/api.py
Simple merge

diff --cc jenkinsapi/fingerprint.py
index 0fa279c,271415a..a30a79f
--- 1/jenkinsapi/fingerprint.py
--- 2/jenkinsapi/fingerprint.py
+++ b/jenkinsapi/fingerprint.py
@@@ -5,8 -5,13 +5,13 @@@ Module for jenkinsapi Fingerprin
  from jenkinsapi.jenkinsbase import JenkinsBase
  from jenkinsapi.custom_exceptions import ArtifactBroken
  
 -try:
+     from urllib2 import HTTPError
+ except ImportError:
+     # Python3
+     from urllib.error import HTTPError
+ 
  import re
 +import requests
  
  import logging
  

diff --cc jenkinsapi/jenkins.py
Simple merge

diff --cc jenkinsapi/job.py
Simple merge

diff --cc jenkinsapi/jobs.py
Simple merge

diff --cc jenkinsapi/node.py
Simple merge

diff --cc jenkinsapi/plugins.py
Simple merge

diff --cc jenkinsapi/view.py
Simple merge

diff --cc jenkinsapi_tests/unittests/test_jenkins.py
Simple merge

diff --cc jenkinsapi_tests/unittests/test_job.py
Simple merge