Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54984
Merged revisions 1486134, 1486217, 1486294, 1486443 from tomcat/trunk:
Ensure that the correct encoding will be used when processing the multipart data.

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