Merge jenkins_docker_fix into master

# Conflicts:
#   Jenkinsfile
6 jobs for jenkins_docker_fix in 0 seconds