Change database key to dbname. Add driver.
Merge branch 'HF_fix_dbname_parameter' into elasticsearch