Merge proposals dependent on lp://qastaging/ubuntu/lucid-security/libcommons-fileupload-java

1. Lucid (10.04)
2. lucid-security
3. Dependent merge proposals