Hanada-san's cosmetic changes
port minor patches to the backend into part-1 patch
Merge branch 'custom_scan' into ctidscan

Conflicts:
	src/include/optimizer/cost.h
remove typo fix
fix tabbing
Merge branch 'custom_scan' into ctidscan