Merge proposals dependent on lp:~threeve/ubuntuone-ios-files/fix-upload-failure-node-deletion

1. fix-upload-failure-node-deletion
2. Dependent merge proposals