Commit 014cfff9a1f56534276654491ec80acc7d08b172

Re-apply update 7022 in case the install happened after 7022 was implemented.  The main scheme definition was not changed at that time to match the update resulting a schema mismatch.