Fixes #8779 - add vlanid to subnet ENC
(cherry picked from commit a899d97175c683bb648e3cbd34d0aebcae1252cf)
Fixes #8779 - add vlanid to subnet ENC
(cherry picked from commit a899d97175c683bb648e3cbd34d0aebcae1252cf)