@RobertHarperFS as you are upgrading from old aem to new aem version, just a suggestion that limit your jsp files and check for alternative ways to solve it. Also check for any new jsp which is present in new AEM version and check how taglibs are handled.