Merge the openflow changes to the nepi-3-dev branch