Merge branch 'master' into 'master'

Master

See merge request automation/pg-tests!1345

Author: Alexander Lakhin

tests_install/test_multimaster_install.py

@@ -93,7 +93,8 @@ def init(self):
             conf.write(
                 'listen_addresses = \'%s\'\n' % ', '.join(
                     self.listen_ips.values()) +
-                'unix_socket_directories = \'\'\n'
+                'unix_socket_directories = \'\'\n' +
+                'multimaster.trans_spill_threshold = \'20MB\'\n'
             )
         with open(os.path.join(self.datadir, 'pg_hba.conf'), 'a') as hba:
             hba.write(