Merge "Do not run clustercheck on the host after O->P upgrade"