Issue #2409435 by Jo Fitzgerald, phenaproxima, srjosh, edysmp, KarenS, svendecabooter, bdimaggio, hosef, Yogesh Pawar, heddn, quietone, alexpott, larowlan: Upgrade path for Book 6.x and 7.x