The City of London and Smithfield traders have agreed on a plan to move the market to a new location "within the M25" when the site closes.