[Bug 1161289] Multi-Master setup: upgrade from 1.16.x to 1.17.0 breaks cluster (update order)