Merge proposals dependent on lp://staging/~higorpinto/oship/cr-ehr

lp://staging/~higorpinto/oship/cr-ehr has no merge proposals.