ENG-4275: Merge 3.0 client fixes into 2.8.4.2 branch.

Don't pull until CI does it's thing.