Merging the openflow part to the nepi-3-dev branch