--->
-<!--
- Commented out, because NIC brings in Li designed OpenFlowPlugin
- which leads to BindException.
- <feature version='${feature.nic.version}'>odl-nic-core</feature>
--->
- <feature version='${feature.ovsdb.version}'>odl-ovsdb-openstack</feature>
+ -->
+ <!-- Depends on NIC, which is commented out.
+ <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-vpnservice-openstack</feature>
+ -->
+ <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
+ which leads to BindException.
+ Also, NIC merge jobs are currently failing.
+ <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
+ -->
+ <feature version='${feature.netvirt.version}'>odl-ovsdb-openstack</feature>
+ <feature version='${feature.netvirt.version}'>odl-ovsdb-sfc</feature>