Update setup_jetty.sh
Merge remote-tracking branch 'origin/master' into master2

Conflicts:
	jetty_setup.sh