Merge branch 'custom_scan' into ctidscan

Conflicts:
	src/include/optimizer/cost.h
Merge branch 'ctidscan' of github.com:kaigai/sepgsql into ctidscan