Merge r1035075 TUSCANY-3762: Fix comments in pom.xml files and clean up handling of filtered resource files