Merge proposals

base-passwd in Ubuntu has no merge proposals.