Two more RI fast-path issues

Applying: Don't free a cached RI plan that may be in use
Using index info to reconstruct a base tree...
M	src/test/regress/expected/foreign_key.out
M	src/test/regress/sql/foreign_key.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/foreign_key.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/foreign_key.sql
Auto-merging src/test/regress/expected/foreign_key.out
CONFLICT (content): Merge conflict in src/test/regress/expected/foreign_key.out
Patch failed at 0001 Don't free a cached RI plan that may be in use

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"