Merge "Remove unused commons-fileupload"