Correctly calculate the size of FileUploads. See BZ-418985
Remove debugging cruft
Merge pull request #1 from eclipse/2.x

2.x