RAZ-2876: Fix for merge issues
- Added in missing entries in update.cfc for issue 2829
RAZ-2876: Fix for merge issues
- Added in missing entries in translation files for 2815
Merge branch 'feature/RAZ-2876' of github.com:razuna/razuna into develop