Merge "Bug-4957 Cluster Role change fix"