merged master into 2.0

We saw some local HA flakiness and want jenkins to double check.