Merge "Updated comac multicluster configs"