Mark early versions as merged

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1507028 13f79535-47bb-0310-9956-ffa450edef68
Update to latest Commons FileUpload trunk

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