Merge pull request #1048 from jmaas/release24

Properly name the VLAN interface