Merge proposals dependent on lp:~matt-goodall/canonical-identity-provider/bson-reality

lp:~matt-goodall/canonical-identity-provider/bson-reality has no merge proposals.