Merge pull request #245 from rfellows/dev

BISERVER-10012 - Data sources: Analysis and Metadata import break Type a...
Merge pull request #246 from rfellows/dev

BISERVER-10012 - Adding missing translation strings
BISERVER-10012 - Fixing more missing i18n string properties