port minor patches to the backend into part-1 patch
fix tabbing
Merge branch 'custom_scan' into cache_scan

Conflicts:
	src/backend/nodes/bitmapset.c
	src/include/nodes/bitmapset.h
	src/include/optimizer/cost.h