print useful dataSource failure msgs

also fixed an integration test that should not be passing,
but it was earlier which is concerning

also cleaned up some black magic in DataSourceConfigUtil,
functionality remaned the same, but easier to read.