refactored for Icehouse RC1 with ML2/OVS networking