update to 1.588
Merge branch 'master' of github.com:kcyeu/docker-jenkins

Conflicts:
	Dockerfile