CLC-3689 Remove MERGED_FEEDS and associated code