Undo LinkDiscoveryManager 'bug' fix from a while back. We'll test to see if it's what's causing some issues with invalid ethertypes. Also, includes a patch for OFChannelHandler that will accept the smallest of the OpenFlow versions during the initial handshake.