Added the options of cluster and connector to the connectorClusterConfig
Merge remote-tracking branch 'origin/develop' into develop