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/trunk@1622163 13f79535-47bb-0310-9956-ffa450edef68