Merge branch 'jonas'

Conflicts:
	lib/java_buildpack/container/jonas.rb