cherry-pick vlan interface fix from master

Ref https://github.com/rcbops/chef-cookbooks/issues/757