Merge branch 'custom_scan' into ctidscan

Conflicts:
	src/include/optimizer/cost.h
Merge branch 'ctidscan' into postgres_fdw

Conflicts:
	src/backend/nodes/bitmapset.c
	src/include/nodes/bitmapset.h
Merge branch 'postgres_fdw' of github.com:kaigai/sepgsql into postgres_fdw