Merge branch '5821-dmarc-open' into 'develop'

Open existing DMARC record instead of new one if one exists (#5821)

Closes #5821

See merge request !1263