Resolve #3218659 "Update core patch"

Fixes getting the newly created files in the patch everywhere (in the web root, in b/, in core/core, in core/b/core, etc. my fixing the -p2 parameter to patch and not leaving it up to composer-patches to find the actual patch depth.