Merge proposals dependent on lp://staging/~jose-exposito89/ubuntuone-ios-files/Bug-1050848

lp://staging/~jose-exposito89/ubuntuone-ios-files/Bug-1050848 has no merge proposals.