Merge pull request #18 from mpath/conflictor

Conflicts
Merge pull request #20 from mpath/vif_id_on_device

Vif id on device
Fixes RM#3281
Merge pull request #21 from mpath/vif_id_on_device

Fixes RM#3281
Merge pull request #40 from mpath/master

Fixes RM#3281