Re-ordered when we clear private non-timeout based state.

- This way we can successfully reject connection deferrals.

#2189
Added a test to verify when we start->stop->start that all deferred's are rejected or resolved correctly.

#2189