Fix java parameters
Merge branch 'master' of https://github.com/gabrielmoreira/jenkins-docker

Conflicts:
	build-files/supervisord.conf