BZ 984188 -unifying UI for creation of new datasource / data provider
Merge remote-tracking branch 'jhrcek/UI_fix'