Merge branch 'fix-avs-nri-service' into 'master'

Change enable_link to enable_service on nri service discovery.

See merge request !3503

(cherry picked from commit 09b5b40a)

8346e96d Change enable_link to enable_service on nri service discovery.
9 jobs for !3511 with cherry-pick-09b5b40a in 16 minutes and 12 seconds (queued for 2 seconds)
merge request