Merge from Perforce
Add the test case of checking disabled cluster redundancy