Ensure that notifications actually cause a wait.

I found that running the our automated tests with the latest controller there was a failure in that 'show connections' printed nothing on the first time and then did after that. Digging a bit deeper it showed that the waiting for command completion was not working any more. I think this is the fix that is required.