EZP-22925: fix database driver config injection
Merge pull request #878 from ezsystems/fix-EZP-22925-database-injection

Fix EZP-22925: Database setting injection is broken
EZP-22930: remove duplicate criteria