Improved process_headers.pl and fixed newly-found include weirdness in s2.
Fixed process_timings_output.pl.
Merge branch 'sam_process_headers_improvement' into sam_2134_base
Merge branch 'sam_2134_base' into sam_2134_iii

Conflicts:
	src/rdb_protocol/geo/s2/base/basictypes.h