Merge "Allow jchalard@, maze@ and reminv@ to approve fixes for flaky tests."