Merge proposals

geronimo-commonj-spec in Ubuntu has no merge proposals.