Clean up warnings from s_all.
Merge branch 'develop' into fine-grained-durability

Conflicts:
	dist/s_define.list