Merged revisions r1561074-r1561075 from tomcat/trunk:
Remove $Id keyword from conf/**
Remove svn:keywords property from conf/**

svn propdel svn:keywords --depth infinity


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