Merge changes from topic 'fix-broken-tests'

* changes:
  Submit: Set correct patch set on approval when submitting new patch set
  Fix broken SubmitByCherryPickIT

gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
index 010ea75..293914b 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
@@ -74,7 +74,7 @@
 
   protected Provider<DataSource> dsProvider;
 
-  private Path sitePath;
+  private Path sitePath = Paths.get(".");
 
   protected SiteProgram() {
   }
@@ -193,7 +193,7 @@
     Module m = new AbstractModule() {
       @Override
       protected void configure() {
-        bind(Path.class).annotatedWith(SitePath.class).toInstance(sitePath);
+        bind(Path.class).annotatedWith(SitePath.class).toInstance(getSitePath());
         bind(SitePaths.class);
       }
     };
@@ -225,7 +225,7 @@
     modules.add(new AbstractModule() {
       @Override
       protected void configure() {
-        bind(Path.class).annotatedWith(SitePath.class).toInstance(sitePath);
+        bind(Path.class).annotatedWith(SitePath.class).toInstance(getSitePath());
       }
     });
     modules.add(new GerritServerConfigModule());