Fixes for 1658 and 1659

For the `dbtype` fix, we were currently supporting this via a separate settings config potentially enabling the datastore to be configured as sqlserver, oracle, or whatever else geoserver could support. Not sure any value other than 'postgis' was ever tested or used. An alternative would be to support a setting value from the database config though haven't looked if this would muck up django.