Added extra verifyReconnect checks to ensure that if the client goes to sleep that we do not mark it active prior to trying to reconnect.

- Also added a test to verify that this scenario is covered.

#2528
Merge branch 'release' into dev