Merge branch 'noc-1328' into 'master'

#1328 Add vlan_ids to unit ConfDB syntax.

See merge request !4140

(cherry picked from commit 1af34d37)

17cb74c6 Add vlan_ids to unit ConfDB syntax.
7 jobs for !4195 with cherry-pick-1af34d37 in 13 minutes and 43 seconds (queued for 2 seconds)
merge request