Merge branch 'master' into release_2_5

Author: gsmolk

tests/incr_restore.py

@@ -288,6 +288,7 @@ def test_basic_incr_restore_sanity(self):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             initdb_params=['--data-checksums'],
+            set_replication=True,
             pg_options={'autovacuum': 'off'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')