Backport of #1113 should fix #622
Merge pull request #1323 from eMerzh/backport_1113

Backport of #1113, Fix rendering of database connection error page