Issue #3551354 by mably: Use schema when saving domain overrides

Frank Mablyrequested to merge
issue/domain-3551354:3551354-use-schema-when into 3.x

Closes #3551354

Merge request reports