Merge branch 'stable-3.2'

* stable-3.2:
  Set version to 3.2.0-rc4
  Update git submodules
  GerritSimulation: Allow scenarios to further customize waits

Change-Id: Ia379197bfcaaadb02bb673a6c39306b7366b7634
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala
index fb79f80..b427c0d 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala
@@ -32,7 +32,7 @@
   protected val unique: String = name + "-" + this.hashCode()
 
   private val powerFactor: Double = replaceProperty("power_factor", 1.0).toDouble
-  private val SecondsPerWeightUnit: Int = 2
+  protected val SecondsPerWeightUnit: Int = 2
   val maxExecutionTime: Int = (SecondsPerWeightUnit * relativeRuntimeWeight * powerFactor).toInt
   private var cumulativeWaitTime: Int = 0