Merge "Add serialversionUUID to cluster/datastore/modification"