Revert "CONN-775:Revert Format domain.xml templates on all 4 daomin.xml
templates"

This reverts commit 37568825c02e32c9fecb63809e188d00175051ba.