415062 SelectorManager wakeup optimisation

Some further cleanup after sbordet review