Squashed commit of the following: merge fixes to master
commit a52a1214460ed3a602747baca40a5180ea60e359
commit 09fe37baa5662fce8812211c26147377e3adf86c
    Added code to hide joining count from cluster health.
commit 6fb781844ad50ed6bcd4ebb253f329442188019d
    Removed Joining cluster
Merge remote-tracking branch 'upstream/master'