Fix errors on NRI pormapper and service discovery.

9 jobs for !3383 with fix-avs-nri-services in 55 seconds (queued for 2 seconds)
merge request