Merge proposals dependent on lp://qastaging/~thisfred/ubuntuone-client/add-counter

lp://qastaging/~thisfred/ubuntuone-client/add-counter has no merge proposals.