Merge pull request #234 from jeffreythomas/dev

BISERVER-9032 - Data Source Wizard is still available to administrators ...
BISERVER-9195 Return onDialogCancel when cancel is pressed
Merge pull request #235 from pentaho-tband/BISERVER-9195

BISERVER-9195 Return onDialogCancel when cancel is pressed
PDB-1594 - You should not be able to edit or delete non-data source wizard data sources from the select data source dialog in Dashboards