Fix the context of some patches so that they apply with stricter patch(1)
PR: 223545 With hat: portmgr