Ensure that E-Mail message gets persisted even if the delivery mechanism throws a DAE. The caller can check whether a mail failed by checking the outcome of getReference. Non-null means the message was delivered. Update template e-mail helper to allow the outcome of mail send to be queried.
Saving an XmlEntity should check whether a keySafe is specified, and if not, store the entry plain. In the next major release, change this to avoid accidental passing a null KeySafe (make a developer have to explicitly select plain).
Update version
[maven-release-plugin] prepare release v2.5.1
Send mail result was inverted
Template service merge/preview should take a Writer, not return a string
Merge changes from 2.5 branch
Enhance import/export of templates