Merge branch 'fix-avs-cleanup-vc-ui' into 'master'

Cleanup vc_domain fields on UI.

See merge request !6757

(cherry picked from commit 13c42862)

0119be2f Cleanup vc_domain fields on UI.
8 jobs for !6758 with cherry-pick-13c42862 in 14 minutes and 53 seconds (queued for 5 seconds)
latest merge request