Remove "svn:merginfo" property

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1531281 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55639
Merged revisions r1530296, r1530298, r1530325, r1530342, r1530348, r1530353, r1530791, r1530822, r1530989, r1531130, r1531138, r1531156, r1531161, r1531271 from trunk:
Add a Drawboard WebSocket example.

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