Begin merging in callback notification support from the clt conn
code.

The srv conn code didn't require it.