OZP-150: refactor layout upgrade so that each change upgrades if necessary