Merged r1545863 from tomcat/trunk:
Fix Cobertura runs that were broken by r1545075

I do not know what exactly went wrong, but I suspect that re-declaring a <path> with the same id was overwriting the previous definition. Thus I moved those into separate <target> that executes conditionally.

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