Fixes list ordering assertion failures
Merge pull request #41 from mpath/vif_id_on_device

Fixes list ordering assertion failures