Use a config point for domain-contacts-optional

Use a config point for domain-contacts-optional #902