BISERVER-10012 - Data sources: Analysis and Metadata import break Type a...

...nd Add data source labels.