Merge pull request #431 from e-cuellar/master

[BISERVER-11752] Data Source Wizard: Creating datasources from SQL Queries or Database Tables fails
[TEST] Fix for LegacyDatasourceConverterTest