fix notification test and assure that CLUSTER_CONNECTION_START is always sent first
added check for null
Merge pull request #1687 from andytaylor/master-fix

couple of test fixes