MFV r366253
This modifies only the openzfs svn:mergeinfo property, since r366253 has already been committed to head.