WebLinkback: fix for importing CFG_DATABASE values
dbquery: fix for importing CFG_DATABASE values
Merge branch 'master' into next

* master:
  dbquery: fix for importing CFG_DATABASE values
  WebLinkback: fix for importing CFG_DATABASE values
dbquery: handle also CFG_DATABASE_TYPE
testutils: fix for importing CFG_DATABASE values