fixing bugs, now it really really works (modulo openflow.discovery link timeout)
Merge branch 'thread_bug'