Merge branch 'master' into fdw_select_simple

diff --cc src/backend/commands/vacuum.c
Simple merge

diff --cc src/backend/nodes/outfuncs.c
Simple merge

diff --cc src/backend/optimizer/plan/createplan.c
Simple merge

diff --cc src/backend/optimizer/util/pathnode.c
Simple merge

diff --cc src/include/nodes/relation.h
Simple merge