Comment 4 for bug 853612

That looks like it might do the job. Although when I go through and check that it does work in my test environment I'll change the

   def exp_initial_dbname(self):
       dbname = tools.config['db_name']
       if not dbname:
           return 'template1'
       return dbname

to ..

   def exp_initial_dbname(self):
       dbname = tools.config['db_name']
       if not dbname:
           return 'postgres'
       return dbname

I do notice that there is still a

         db = sql_db.db_connect('template1')

Just after that first block of changes. Considering that the rest of them seem to be removed, is that connection to template1 still planned?