SSP-982 Fix handling of non-db-url CLI args