Fix for 'Cluster is not operational' issue
Merge pull request #2767 from lutovich/2.1-cluster-is-not-operational

Fix for 'Cluster is not operational' issue