Properly generate a PHP /etc/roundcube/debian-db.php file
Merge branch 'jp-roundcube-fixes'