Merge branch 'fix-avs-generic-ent-id' into 'master'

Generic.get_capabilities. Fix bad enterprise id check.

See merge request !3084

(cherry picked from commit 1cf35eb7)

be6e05d0 Generic.get_capabilities. Fix bad enterprise id check.
13 jobs for !3086 with cherry-pick-1cf35eb7 in 15 minutes and 59 seconds (queued for 3 seconds)
merge request