Merge branch 'stable-2.7'

* stable-2.7:
  Fix spelling errors in access-control.txt
  Access control documentation: Formatting
  Access control documentation: Clean up of categories
  Access Control Documentation: Explain special and magic refs
  Set core plugins to correct revisions for 2.6-rc2
  Update developer instructions for cloning the Gerrit project
  Fix Windows build

Conflicts:
	Documentation/access-control.txt

Change-Id: I1ee212d357f0da6d006c5fef9427a4b7138c7536

Documentation/access-control.txt

@@ -374,7 +374,6 @@ Magic references
 These are references with added functionality to them compared to a regular
 git push operation.
 
-
 refs/for/<branch ref>
 ^^^^^^^^^^^^^^^^^^^^^
 
@@ -411,6 +410,7 @@ Gerrit has several permission categories that can be granted to groups
 within projects, enabling functionality for that group's members.
 
 
+
 [[category_abandon]]
 Abandon
 ~~~~~~~
@@ -1113,7 +1113,6 @@ category. In the "`All-Projects`" we define the following rules:
     label-Release-Process = -1..+1 group Release Engineers
 ====
 
-
 [[global_capabilities]]
 Global Capabilities
 -------------------

tools/version.sh

@@ -52,7 +52,7 @@ case "$V" in
 v*) V=$(echo "$V" | perl -pe s/^v//) ;;
 esac
 
-perl -pi -e '
+perl -pi.bak -e '
 	if ($ARGV ne $old_argv) {
 		$seen_version = 0;
 		$old_argv = $ARGV;
@@ -62,3 +62,8 @@ perl -pi -e '
 		s{(<version>).*(</version>)}{${1}'"$V"'${2}};
 	}
 	' $POM_FILES
+
+for pom in $POM_FILES
+do
+	rm -f ${pom}.bak
+done