JBTM-1959 ensure we notify all waiters