Merge branch 'master' into fdw_core

diff --cc doc/src/sgml/ref/alter_default_privileges.sgml
Simple merge

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

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