Change #1697 was already merged to master, but I backed it out in #1725 because it looked like it might be responsible for the frequent upgrade-test failures on CI (even though it obviously passed CI itself before it was merged).
I think now that all the upgrade-test failures were due to the recently fixed catapult issues (and/or to running out of loadbalancers/firewall resources on GKE). This PR is just going to re-apply the original changes that were already merged before.
Change #1697 was already merged to
master, but I backed it out in #1725 because it looked like it might be responsible for the frequent upgrade-test failures on CI (even though it obviously passed CI itself before it was merged).I think now that all the upgrade-test failures were due to the recently fixed catapult issues (and/or to running out of loadbalancers/firewall resources on GKE). This PR is just going to re-apply the original changes that were already merged before.