Merge proposals dependent on lp://staging/~dreis-pt/ocb-addons/7.0-bug1079476-dr

lp://staging/~dreis-pt/ocb-addons/7.0-bug1079476-dr has no merge proposals.