Merge remote-tracking branch 'origin/1.12'
bump to latest jetty, also add jetty-deploy dep
auto-scan for webapps
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/master' into pjsm/2.0