Merge "Fix for openflow devices not connecting to controller"