Merge pull request #244 from rfellows/dev

BISERVER-9993 - Data Source Model Editor - Auto Populate not working whe...
BISERVER-10012 - Data sources: Analysis and Metadata import break Type and Add data source labels.