Try Jonas higher priority than Tomcat
Merge branch 'jonas'