BAMPFA-70: Fix merging of message bundle strings containing a colon.
Merge branch 'ucb-deploy_4.0' into cinefiles_4.0