Keep messageTemplate intact when possible (ie not for legacy).

Use case: REST connector error serialization. The client often expects error codes/translation keys.
checkstyle