Merge branch 'avincent/add-virtual-service' into 'master'

add virtual service

See merge request !239
24 jobs for master in 17 minutes and 39 seconds (queued for 6 seconds)