Issue 6530 cluster page reports incorrectly

This issue also have pulls on license and enterprise branches