Merge branch 'master' into release_2_6

Author: funny-falcon

tests/archive.py

@@ -317,7 +317,7 @@ def test_pgpro434_4(self):
         gdb.set_breakpoint('pg_stop_backup')
         gdb.run_until_break()
 
-        self.set_auto_conf(node, {'archive_command': "'exit 1'"})
+        self.set_auto_conf(node, {'archive_command': 'exit 1'})
         node.reload()
 
         os.environ["PGAPPNAME"] = "foo"