updated jndi, jaas and annotation tests to webapps.demo
Merge remote-tracking branch 'origin/master' into servlet-3.1-api