Merge branch 'hotfix/3.1.5.4' into develop

diff --cc python/londiste/handlers/dispatch.py
index d139428c91d53f17213c7dd31e4e3f5d57797c7e,2a39475a551ff4d22e3f47dd456c527ae8fe2b64..66f43f76cbeb629468e25f7ff3025009c3c77cfa
--- 1/python/londiste/handlers/dispatch.py
--- 2/python/londiste/handlers/dispatch.py
+++ b/python/londiste/handlers/dispatch.py
@@@ -921,9 -926,12 +922,10 @@@ class Dispatcher (ShardHandler)
          sql = "select " + func + " (%s, %s, %s)"
          self.log.debug("func: %s, args: %s", func, args)
          curs.execute(sql, args)
 -        res = []
 -        for row in curs.fetchall():
 -            res.append(row[0])
 +        res = [row[0] for row in curs.fetchall()]
          if res:
              self.log.info("Dropped tables: %s", ", ".join(res))
+         return res
  
      def get_copy_condition(self, src_curs, dst_curs):
          """ Prepare where condition for copy and replay filtering.