Backport the fixes for updating to a new major version / branch.

This will allow us to begin rolling out updates from 9.2 -> 10.x