changing for using URL instead of VERSION in jetty setup
Merge remote-tracking branch 'origin/master' into master2