Revert unnecessary merges on 6.1.x

This commit removes unnecessary main-branch merges starting from
9f8db22b77 and adds the following
needed commit(s) that were made afterward:

- 4d6ff49b9d
- ed6ff670d1
- c823b00794
- 44fad21363

git/hooks/prepare-forward-merge

@@ -4,7 +4,7 @@ require 'net/http'
 require 'yaml'
 require 'logger'
 
-$main_branch = "6.2.x"
+$main_branch = "6.1.x"
 
 $log = Logger.new(STDOUT)
 $log.level = Logger::WARN