Merge branch 'master' into fdw_select

Conflicts:
	src/backend/optimizer/plan/createplan.c

diff --cc src/backend/optimizer/path/costsize.c
Simple merge

diff --cc src/backend/optimizer/plan/createplan.c
index d2734907c31d6b74f3e7e3c2f1c4f8a0a3bfa832,2c398d2eed9b116dd47333123863fee957cb697d..edf9f8bc8e95df217f1f58f7ea298c1ccc43d7a7
--- 1/src/backend/optimizer/plan/createplan.c
--- 2/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@@ -20,7 -20,7 +20,8 @@@
  #include <math.h>
  
  #include "access/skey.h"
 +#include "catalog/pg_class.h"
+ #include "miscadmin.h"
  #include "nodes/makefuncs.h"
  #include "nodes/nodeFuncs.h"
  #include "optimizer/clauses.h"

diff --cc src/backend/optimizer/prep/prepunion.c
Simple merge

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

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

diff --cc src/include/optimizer/cost.h
Simple merge