Merge proposals dependent on lp://staging/~mandel/ubuntuone-client/use-new-fsevents-api

lp://staging/~mandel/ubuntuone-client/use-new-fsevents-api has no merge proposals.