PRD-4254 - Reverting changes to JDBC dialog - we can live without them,
  and the shared connection/JNDI definitions can work as planed.
PRD-4936 - Fix NPE when editing a datasource that has no query