SP-655 - Fix for creating reporting and analysis datasources using DSW