DATASET-1015 fixes for mysql73-cluster