Merge "Fixed calico checksum in master-cluster test"