Merge "Bug 4957 Fix Cluster Role change for Statistics Polling"