VAT-651 Move message templates and db fixes to beta5.