Merge "Bug 6633 : NXM_OF_IN_PORT support in openflowplugin"