Merged revision 1622163 from tomcat/trunk:
Fixed the multipart elements merge operation performed during web application deployment. Identified by Coverity Scan.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1622164 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1621731 from tomcat/trunk:
Correct the return value for StandardContext.getResourceOnlyServlets()
so that multiple names are separated by commas. Identified by Coverity
Scan and fixed based on a patch by Felix Schumacher.


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