Warburtons crumpets have returned to the shelves of Waitrose, more than two years after the bakery’s products were exiled in a row over prices.