Fixed trivial style issues.
Merge branch 'sam_803_style' into next

Conflicts:
	src/rdb_protocol/btree_store.hpp