Update undertow framework to use latest stable Undertow
Merge branch 'master' of https://github.com/stuartwdouglas/FrameworkBenchmarks into 845
Merge branch 'undertow' of https://github.com/ctomc/FrameworkBenchmarks into 865

Conflicts:
	undertow/pom.xml
Merge branch '865'