4.15
Merge branch 'master' of https://github.com/T0nyMa/java-buildpack

Conflicts:
	config/java_opts.yml