Merge branch 'noc-1298' into 'master'

#1298 PrefixDiscovery takes account of MO's VRF

See merge request !3625

(cherry picked from commit 8e314915)

10a4e66f #1298 PrefixDiscovery takes account of MO's VRF
9 jobs for !3717 with cherry-pick-8e314915 in 1 minute and 13 seconds (queued for 2 seconds)
merge request