Matthew Pickering authored Mar 30, 2023 and Marge Bot committed Apr 03, 2023

Also fixes the ./generate_bootstrap_plans script which was recently
broken

We can hopefully drop the 9.2 plans soon but they still work so kept
them around for now.