JBTM-1959 ensure we notify all waiters
Merge pull request #480 from tomjenkinson/JBTM-1959-master

JBTM-1959 ensure we notify all waiters