Merged r1530426 from tomcat/trunk:
Add index.xhtml to the welcome files for the examples webapp
It is used by WebSocket (JSR356) Examples.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1552895 13f79535-47bb-0310-9956-ffa450edef68
Remove explicit mergeinfo from the file
(Noted when reviewing commit message for r1547931)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1552896 13f79535-47bb-0310-9956-ffa450edef68