fixed references to hardcoded db connection
Merge commit 'be837235300ec5fb6c5ec74069385fbed1f0e328'