Merge "init: Default database type to JDBC when url is present" into stable-2.6