WIP: Fix creation of floating network when vlan is disabled.

This is work in progress to address bnc#875800, please do not merge yet. It's barely tested.