Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Switch to gs-maven-wagon for API deployment

pom.xml

diff --git a/pom.xml b/pom.xml
index 6341800..fff626f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,9 +465,9 @@
 
     <extensions>
       <extension>
-        <groupId>net.anzix.aws</groupId>
-        <artifactId>s3-maven-wagon</artifactId>
-        <version>3.2</version>
+        <groupId>com.googlesource.gerrit</groupId>
+        <artifactId>gs-maven-wagon</artifactId>
+        <version>3.3</version>
       </extension>
     </extensions>
   </build>

tools/deploy_api.sh

diff --git a/tools/deploy_api.sh b/tools/deploy_api.sh
index e5909e54..26baa31 100755
--- a/tools/deploy_api.sh
+++ b/tools/deploy_api.sh
@@ -15,7 +15,7 @@
   ;;
 *-[0-9]*-g*) type=snapshot ;;
 esac
-URL=s3://gerrit-api@commondatastorage.googleapis.com/$type
+URL=gs://gerrit-api/$type
 
 
 echo "Deploying $type gerrit-extension-api $VER"