OZP-150: refactor layout upgrade so that each change upgrades if necessary
Merge branch 'master' into feature/ozp-150-create-dashboard
Merge branch 'feature/ozp-150-create-dashboard' into feature/ozp-16-migrate-dashboard-switcher