Merge updates from Commons FileUpload to r1456912

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1456916 13f79535-47bb-0310-9956-ffa450edef68
Merge updates from Commons FileUpload to r1456918

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1456920 13f79535-47bb-0310-9956-ffa450edef68
Re-remove deprecated code that sneaked back in during a merge

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1456926 13f79535-47bb-0310-9956-ffa450edef68
Review the diff to FileUpload trunk and better our fork

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