Fix database prefix usage
Merge pull request #1688 from GPCsolutions/3.5-databaseprefix

Fix database prefix usage