SLIDER-280. Add unit and functional tests for agents discovering AM after restart - removing extra .orig file (Gour Saha via smohanty)