Merge proposals dependent on lp://staging/~donkirkby/openobject-server/config-defaults

lp://staging/~donkirkby/openobject-server/config-defaults has no merge proposals.