Dundas and CMS partners agree two-year lock-in as merger terms take shape