Merge branch 'per_column_option' into force_not_null

Conflicts:
	contrib/file_fdw/file_fdw.c

diff --cc contrib/file_fdw/file_fdw.c
index caf9c86c5aab6bededf3e4475a233fb7c7b8a860,f2d7f3a6a88f47b63aa20051d693f17e6b0dd05f..0097bc7f77999b32daf1ee42e0ef78976fc9bb98
--- 1/contrib/file_fdw/file_fdw.c
--- 2/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@@ -23,9 -23,8 +23,10 @@@
  #include "foreign/fdwapi.h"
  #include "foreign/foreign.h"
  #include "miscadmin.h"
 +#include "nodes/makefuncs.h"
  #include "optimizer/cost.h"
+ #include "utils/rel.h"
 +#include "utils/syscache.h"
  
  PG_MODULE_MAGIC;